Messages in this thread | | | Date | Tue, 25 Oct 2011 19:37:31 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with Linus' tree |
| |
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in net/bluetooth/l2cap_sock.c between commit 6230c9b4f895 ("bluetooth: Properly clone LSM attributes to newly created child connections") from Linus' tree and commit ac86caa04348 ("net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc net/bluetooth/l2cap_sock.c index a4a9d12,fa5e166..0000000 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@@ -26,7 -26,7 +26,8 @@@ /* Bluetooth L2CAP sockets. */ +#include <linux/security.h> + #include <linux/export.h> #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> [unhandled content-type:application/pgp-signature] | |