lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 3 Aug 2014 23:30:35 -0700 From: Alexei Starovoitov <ast@...mgrid.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: James Morris <jmorris@...ei.org>, David Miller <davem@...emloft.net>, Network Development <netdev@...r.kernel.org>, linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>, Kees Cook <keescook@...omium.org> Subject: 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 <sfr@...b.auug.org.au> 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 c8bee430dc52 ("seccomp: split filter prep from check and > apply") and 3ba2530cc06e ("seccomp: allow mode setting across threads") > from the security tree. > > I fixed it up (I hope - see below) and can carry the fix as necessary > (no action is required). Looks correct. Thanks. Will double check during merge window. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists