On 08/15/2016 02:35 AM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming")
from the net tree and commit:
60d20f9195b2 ("bpf: Add bpf_current_task_under_cgroup helper")
from the net-next tree.
I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
