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: Thu, 5 Jan 2012 15:12:55 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Eric Paris <eparis@...hat.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Paul Moore <pmoore@...hat.com>,
Andrei Emeltchenko <andrei.emeltchenko@...el.com>,
David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
"Gustavo F. Padovan" <padovan@...fusion.mobi>
Subject: linux-next: manual merge of the selinux tree with the net-next tree
Hi Eric,
Today's linux-next merge of the selinux tree got a conflict in
net/bluetooth/l2cap_sock.c between commit 15770b1ab974 ("Bluetooth:
convert force_active variable to flag in l2cap chan") from the net-next
tree and commit 53860f3d0499 ("bluetooth: Properly clone LSM attributes
to newly created child connections") from the selinux tree.
These both remove the same line, but there is probably something more
subtle going on ... I just used the version from the net-next tree.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists