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

Stephen Rothwell
2013-04-11T04:03:25Z

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a conflict in tools/Makefile
between commit e306e2c13b8c ("filter: add minimal BPF JIT image
disassembler") from the net-next tree and commit 85c66be101e1 ("perf
tools: Introduce tools/lib/lk library") from the tip tree.

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

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc tools/Makefile
index c73c635,6aaeb6c..0000000
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -35,7 -34,13 +35,13 @@@ help
cpupower: FORCE
$(call descend,power/$@)

- cgroup firewire lguest perf usb virtio vm net: FORCE
-cgroup firewire guest usb virtio vm: FORCE
++cgroup firewire guest usb virtio vm net: FORCE
+ $(call descend,$@)
+
+ liblk: FORCE
+ $(call descend,lib/lk)
+
+ perf: liblk FORCE
$(call descend,$@)

selftests: FORCE
@@@ -63,7 -68,13 +69,13 @@@ install: cgroup_install cpupower_instal
cpupower_clean:
$(call descend,power/cpupower,clean)

- cgroup_clean firewire_clean lguest_clean perf_clean usb_clean virtio_clean vm_clean net_clean:
-cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean:
++cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean:
+ $(call descend,$(@:_clean=),clean)
+
+ liblk_clean:
+ $(call descend,lib/lk,clean)
+
+ perf_clean: liblk_clean
$(call descend,$(@:_clean=),clean)

selftests_clean:

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]