Messages in this thread | | | Date | Thu, 5 Jan 2012 15:12:55 +1100 | From | Stephen Rothwell <> | 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |