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

From: Alexei Starovoitov
Date: Tue Apr 07 2015 - 12:11:44 EST

On 4/7/15 12:04 AM, Stephen Rothwell wrote:
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).

Looks good. Thanks Stephen.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at