From: Jonathan Corbet <corbet@lwn.net>
Date: Tue, 8 Jan 2019 23:38:36 +0000 (-0700)
Subject: Merge branch 'thorsten' into docs-next
X-Git-Tag: v5.4-rc1~1458^2~64
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c11fcc5ad39ea774853e5b5d8b6158d0b8c6649;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'thorsten' into docs-next
---

7c11fcc5ad39ea774853e5b5d8b6158d0b8c6649
diff --cc tools/Makefile
index 77f1aee,c0d1e59..3dfd72a
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -12,8 -12,8 +12,9 @@@ help
  	@echo '  acpi                   - ACPI tools'
  	@echo '  cgroup                 - cgroup tools'
  	@echo '  cpupower               - a tool for all things x86 CPU power'
+ 	@echo '  debugging              - tools for debugging'
  	@echo '  firewire               - the userspace part of nosy, an IEEE-1394 traffic sniffer'
 +	@echo '  firmware               - Firmware tools'
  	@echo '  freefall               - laptop accelerometer program for disk protection'
  	@echo '  gpio                   - GPIO tools'
  	@echo '  hv                     - tools used when in Hyper-V clients'
@@@ -61,7 -61,7 +62,7 @@@ acpi: FORC
  cpupower: FORCE
  	$(call descend,power/$@)
  
- cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds wmi pci firmware: FORCE
 -cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds wmi pci debugging: FORCE
++cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds wmi pci firmware debugging: FORCE
  	$(call descend,$@)
  
  liblockdep: FORCE
@@@ -138,7 -139,7 +140,7 @@@ acpi_clean
  cpupower_clean:
  	$(call descend,power/cpupower,clean)
  
- cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean:
 -cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean debugging_clean:
++cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean:
  	$(call descend,$(@:_clean=),clean)
  
  liblockdep_clean:
@@@ -176,6 -177,6 +178,6 @@@ clean: acpi_clean cgroup_clean cpupower
  		perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \
  		vm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
  		freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
- 		gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean
 -		gpio_clean objtool_clean leds_clean wmi_clean pci_clean debugging_clean
++		gpio_clean objtool_clean leds_clean wmi_clean pci_clean firmware_clean debugging_clean
  
  .PHONY: FORCE