Messages in this thread | | | Date | Tue, 07 Apr 2015 09:32:31 +0200 | From | Daniel Borkmann <> | Subject | Re: linux-next: manual merge of the tip tree with the net-next tree |
| |
On 04/07/2015 09:11 AM, Stephen Rothwell wrote: ... > Today's linux-next merge of the tip tree got a conflict in > include/uapi/linux/bpf.h between commit 96be4325f443 ("ebpf: add > sched_cls_type and map it to sk_filter's verifier ops"), 03e69b508b6f > ("ebpf: add prandom helper for packet sampling"), c04167ce2ca0 ("ebpf: > add helper for obtaining current processor id"), 94caee8c312d ("ebpf: > add sched_act_type and map it to sk_filter's verifier ops"), > 608cd71a9c7c ("tc: bpf: generalize pedit action") and 91bc4822c3d6 > ("tc: bpf: add checksum helpers") from the net-next tree and commit > 2541517c32be ("tracing, perf: Implement BPF programs attached to > kprobes"), d9847d310ab4 ("tracing: Allow BPF programs to call > bpf_ktime_get_ns()") and 9c959c863f82 ("tracing: Allow BPF programs to > call bpf_trace_printk()") from the tip tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks!
| |