Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1582297 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-02-16 04:30 +0100 |
| Last post | 2017-02-22 16:00 +0100 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kselftest tree with the net-next tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-02-16 04:30 +0100
Re: linux-next: manual merge of the kselftest tree with the net-next tree Shuah Khan <shuahkh@osg.samsung.com> - 2017-02-22 16:00 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-02-16 04:30 +0100 |
| Subject | linux-next: manual merge of the kselftest tree with the net-next tree |
| Message-ID | <tbkVA-qe-3@gated-at.bofh.it> |
Hi Shuah,
Today's linux-next merge of the kselftest tree got a conflict in:
tools/testing/selftests/bpf/Makefile
between commit:
d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update")
from the net-next tree and commit:
88baa78d1f31 ("selftests: remove duplicated all and clean target")
from the kselftest 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/testing/selftests/bpf/Makefile
index c7816fe60feb,058351b0694f..000000000000
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@@ -1,26 -1,7 +1,20 @@@
-CFLAGS += -Wall -O2 -I../../../../usr/include
+LIBDIR := ../../../lib
+BPFOBJ := $(LIBDIR)/bpf/bpf.o
-TEST_GEN_PROGS = test_verifier test_maps test_lru_map
+CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)
+
- test_objs = test_verifier test_tag test_maps test_lru_map test_lpm_map
++TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map
- TEST_PROGS := $(test_objs) test_kmod.sh
- TEST_FILES := $(test_objs)
+ TEST_PROGS := test_kmod.sh
+.PHONY: all clean force
+
- all: $(test_objs)
-
+# force a rebuild of BPFOBJ when its dependencies are updated
+force:
+
+$(BPFOBJ): force
+ $(MAKE) -C $(dir $(BPFOBJ))
+
+$(test_objs): $(BPFOBJ)
+
include ../lib.mk
-
- clean:
- $(RM) $(test_objs)
[toc] | [next] | [standalone]
| From | Shuah Khan <shuahkh@osg.samsung.com> |
|---|---|
| Date | 2017-02-22 16:00 +0100 |
| Message-ID | <tdGyB-3dk-3@gated-at.bofh.it> |
| In reply to | #1582297 |
On 02/15/2017 08:24 PM, Stephen Rothwell wrote:
> Hi Shuah,
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>
> tools/testing/selftests/bpf/Makefile
>
> between commit:
>
> d498f8719a09 ("bpf: Rebuild bpf.o for any dependency update")
>
> from the net-next tree and commit:
>
> 88baa78d1f31 ("selftests: remove duplicated all and clean target")
>
> from the kselftest 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.
>
Sorry to get back to you late. I was away on vacation last week.
Yes. Please let's plan upon carrying the fix.
thanks,
-- Shuah
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web