Subject: linux-next: manual merge of the drivers-x86 tree with the net-next tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 8 Nov 2017 14:29:57 +1100

Hi Darren,

Today's linux-next merge of the drivers-x86 tree got a conflict in:

  tools/Makefile

between commit:

  a92bb546cff0 ("tools: rename tools/net directory to tools/bpf")

from the net-next tree and commit:

  9d64fc08f6fe ("tools/wmi: add a sample for dell smbios communication over WMI")

from the drivers-x86 tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/Makefile
index c03b4f69d5b7,9d2fd2606810..000000000000
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -58,7 -58,7 +59,7 @@@ acpi: FORC
  cpupower: FORCE
  	$(call descend,power/$@)
  
- cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds: FORCE
 -cgroup firewire hv guest spi usb virtio vm net iio gpio objtool leds wmi: FORCE
++cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds wmi: FORCE
  	$(call descend,$@)
  
  liblockdep: FORCE
@@@ -92,8 -92,8 +93,8 @@@ kvm_stat: FORC
  
  all: acpi cgroup cpupower gpio hv firewire liblockdep \
  		perf selftests spi turbostat usb \
 -		virtio vm net x86_energy_perf_policy \
 +		virtio vm bpf x86_energy_perf_policy \
- 		tmon freefall iio objtool kvm_stat
+ 		tmon freefall iio objtool kvm_stat wmi
  
  acpi_install:
  	$(call descend,power/$(@:_install=),install)
@@@ -101,7 -101,7 +102,7 @@@
  cpupower_install:
  	$(call descend,power/$(@:_install=),install)
  
- cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install bpf_install objtool_install:
 -cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install wmi_install:
++cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install bpf_install objtool_install wmi_install:
  	$(call descend,$(@:_install=),install)
  
  liblockdep_install:
@@@ -125,8 -125,9 +126,9 @@@ kvm_stat_install
  install: acpi_install cgroup_install cpupower_install gpio_install \
  		hv_install firewire_install iio_install liblockdep_install \
  		perf_install selftests_install turbostat_install usb_install \
 -		virtio_install vm_install net_install x86_energy_perf_policy_install \
 +		virtio_install vm_install bpf_install x86_energy_perf_policy_install \
- 		tmon_install freefall_install objtool_install kvm_stat_install
+ 		tmon_install freefall_install objtool_install kvm_stat_install \
+ 		wmi_install
  
  acpi_clean:
  	$(call descend,power/acpi,clean)
@@@ -134,7 -135,7 +136,7 @@@
  cpupower_clean:
  	$(call descend,power/cpupower,clean)
  
- cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean:
 -cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean wmi_clean net_clean iio_clean gpio_clean objtool_clean leds_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:
  	$(call descend,$(@:_clean=),clean)
  
  liblockdep_clean:
@@@ -170,8 -171,8 +172,8 @@@ build_clean
  
  clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_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 \
 +		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
+ 		gpio_clean objtool_clean leds_clean wmi_clean
  
  .PHONY: FORCE