Merge branch 'thorsten' into docs-next

diff --cc Documentation/sysctl/kernel.txt
Simple merge

diff --cc tools/Makefile
index 77f1aee,c0d1e59..3dfd72a
--- 1/tools/Makefile
--- 2/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