From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 14 Jan 2016 19:39:09 +0000 (-0800)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.5-rc1~102
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=747a9b0a08ae300b99b8aa7861bd3609f3b3e782;p=linux-block.git

Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Tooling fixes, the biggest patch is one that decouples the kernel's
  list.h from tooling list.h"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  perf tools: Fallback to srcdir/Documentation/tips.txt
  perf ui/tui: Print helpline message as is
  perf tools: Set and pass DOCDIR to builtin-report.c
  perf tools: Add file_only config option to strlist
  perf tools: Add more usage tips
  perf record: Add --buildid-all option
  tools subcmd: Add missing NORETURN define for parse-options.h
  tools: Fix formatting of the "make -C tools" help message
  tools: Make list.h self-sufficient
  perf tools: Fix mmap2 event allocation in synthesize code
  perf stat: Fix recort_usage typo
  perf test: Reset err after using it hold errcode in hist testcases
  perf test: Fix false TEST_OK result for 'perf test hist'
  tools build: Add BPF feature check to test-all
  perf bpf: Fix build breakage due to libbpf
  tools: Move Makefile.arch from perf/config to tools/scripts
  perf tools: Fix PowerPC native building
  perf tools: Fix phony build target for build-test
  perf tools: Add -lutil in python lib list for broken python-config
  perf tools: Add missing sources to perf's MANIFEST
  ...
---

747a9b0a08ae300b99b8aa7861bd3609f3b3e782
diff --cc tools/Makefile
index 1dc6900468ed,09ec69db4bc8..6339f6ac3ccb
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -8,24 -8,23 +8,24 @@@ include scripts/Makefile.includ
  help:
  	@echo 'Possible targets:'
  	@echo ''
- 	@echo '  acpi       - ACPI tools'
- 	@echo '  cgroup     - cgroup tools'
- 	@echo '  cpupower   - a tool for all things x86 CPU power'
- 	@echo '  firewire   - the userspace part of nosy, an IEEE-1394 traffic sniffer'
- 	@echo '  hv         - tools used when in Hyper-V clients'
- 	@echo '  iio        - IIO tools'
- 	@echo '  lguest     - a minimal 32-bit x86 hypervisor'
- 	@echo '  perf       - Linux performance measurement and analysis tool'
- 	@echo '  selftests  - various kernel selftests'
- 	@echo '  spi        - spi tools'
- 	@echo '  turbostat  - Intel CPU idle stats and freq reporting tool'
- 	@echo '  usb        - USB testing tools'
- 	@echo '  virtio     - vhost test module'
- 	@echo '  net        - misc networking tools'
- 	@echo '  vm         - misc vm tools'
+ 	@echo '  acpi                   - ACPI tools'
+ 	@echo '  cgroup                 - cgroup tools'
+ 	@echo '  cpupower               - a tool for all things x86 CPU power'
+ 	@echo '  firewire               - the userspace part of nosy, an IEEE-1394 traffic sniffer'
+ 	@echo '  freefall               - laptop accelerometer program for disk protection'
+ 	@echo '  hv                     - tools used when in Hyper-V clients'
+ 	@echo '  iio                    - IIO tools'
+ 	@echo '  lguest                 - a minimal 32-bit x86 hypervisor'
+ 	@echo '  net                    - misc networking tools'
+ 	@echo '  perf                   - Linux performance measurement and analysis tool'
+ 	@echo '  selftests              - various kernel selftests'
++	@echo '  spi                    - spi tools'
+ 	@echo '  tmon                   - thermal monitoring and tuning tool'
+ 	@echo '  turbostat              - Intel CPU idle stats and freq reporting tool'
+ 	@echo '  usb                    - USB testing tools'
+ 	@echo '  virtio                 - vhost test module'
+ 	@echo '  vm                     - misc vm tools'
  	@echo '  x86_energy_perf_policy - Intel energy policy tool'
- 	@echo '  tmon       - thermal monitoring and tuning tool'
- 	@echo '  freefall   - laptop accelerometer program for disk protection'
  	@echo ''
  	@echo 'You can do:'
  	@echo ' $$ make -C tools/ <tool>_install'
@@@ -143,9 -148,12 +149,12 @@@ tmon_clean
  freefall_clean:
  	$(call descend,laptop/freefall,clean)
  
+ build_clean:
+ 	$(call descend,build,clean)
+ 
  clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
 -		perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
 +		perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \
  		vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
- 		freefall_clean
+ 		freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean
  
  .PHONY: FORCE