linux-next: manual merge of the gpio tree with the tip tree

From: Stephen Rothwell
Date: Tue Mar 01 2016 - 23:28:08 EST


Hi Linus,

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

tools/Makefile

between commit:

442f04c34a1a ("objtool: Add tool to perform compile-time stack metadata validation")

from the tip tree and commit:

6d591c46bce0 ("tools/gpio: create GPIO tools")

from the gpio tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

--
Cheers,
Stephen Rothwell

diff --cc tools/Makefile
index cc2a37d975d6,f41e7c6ea23e..000000000000
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -54,7 -54,7 +55,7 @@@ acpi: FORC
cpupower: FORCE
$(call descend,power/$@)

- cgroup firewire hv guest spi usb virtio vm net iio objtool: FORCE
-cgroup firewire hv guest spi usb virtio vm net iio gpio: FORCE
++cgroup firewire hv guest spi usb virtio vm net iio objtool gpio: FORCE
$(call descend,$@)

liblockdep: FORCE
@@@ -120,7 -120,7 +121,7 @@@ acpi_clean
cpupower_clean:
$(call descend,power/cpupower,clean)

- cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean objtool_clean:
-cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean gpio_clean:
++cgroup_clean hv_clean firewire_clean lguest_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean objtool_clean gpio_clean:
$(call descend,$(@:_clean=),clean)

liblockdep_clean:
@@@ -157,6 -157,6 +158,6 @@@ clean: acpi_clean cgroup_clean cpupower
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 build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
- objtool_clean
- gpio_clean
++ objtool_clean gpio_clean

.PHONY: FORCE