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

On Sun, Aug 3, 2014 at 11:26 PM, Stephen Rothwell wrote: > Hi James, > > Today's linux-next merge of the security tree got a conflict in > kernel/seccomp.c between commit 7ae457c1e5b4 ("net: filter: split > 'struct sk_filter' into socket and bpf parts") from the net-next tree > and commits c8bee43

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

Hi James, Today's linux-next merge of the security tree got a conflict in kernel/seccomp.c between commit 7ae457c1e5b4 ("net: filter: split 'struct sk_filter' into socket and bpf parts") from the net-next tree and commits c8bee430dc52 ("seccomp: split filter prep from check and apply") and 3ba2530