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: Mon, 16 Apr 2012 13:29:04 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: James Morris <jmorris@...ei.org>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
Jiri Pirko <jpirko@...hat.com>, Will Drewry <wad@...omium.org>
Subject: 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
include/linux/filter.h between commit ffe06c17afbb ("filter: add XOR
operation") from the net-next tree and commit 46b325c7eb01
("sk_run_filter: add BPF_S_ANC_SECCOMP_LD_W") from the security tree.
Just context changes. I fixed it up (see below) and can carry the fax as
necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
diff --cc include/linux/filter.h
index 7209099,f2e5315..0000000
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -232,7 -239,7 +243,8 @@@ enum
BPF_S_ANC_HATYPE,
BPF_S_ANC_RXHASH,
BPF_S_ANC_CPU,
+ BPF_S_ANC_ALU_XOR_X,
+ BPF_S_ANC_SECCOMP_LD_W,
};
#endif /* __KERNEL__ */
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists