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

From: Stephen Rothwell
Date: Tue Apr 07 2015 - 03:04:15 EST

Hi all,

Today's linux-next merge of the tip tree got a conflict in
samples/bpf/Makefile between commit 91bc4822c3d6 ("tc: bpf: add
checksum helpers") from the net-next tree and commit b896c4f95ab4
("samples/bpf: Add simple non-portable kprobe filter example") (and
following) from the tip tree.

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

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc samples/bpf/Makefile
index d24f51bca465,fe98fb226e6e..000000000000
--- a/samples/bpf/Makefile
+++ b/samples/bpf/Makefile
@@@ -17,7 -25,10 +25,11 @@@ tracex4-objs := bpf_load.o libbpf.o tra
always := $(hostprogs-y)
always += sockex1_kern.o
always += sockex2_kern.o
+always += tcbpf1_kern.o
+ always += tracex1_kern.o
+ always += tracex2_kern.o
+ always += tracex3_kern.o
+ always += tracex4_kern.o

HOSTCFLAGS += -I$(objtree)/usr/include

Attachment: pgpATzpKJnIJ3.pgp
Description: OpenPGP digital signature