Messages in this thread | | | Date | Tue, 07 Apr 2015 09:11:33 -0700 | From | Alexei Starovoitov <> | Subject | Re: linux-next: manual merge of the tip tree with the net-next tree |
| |
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.
| |