archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Paul Gortmaker <>
	Paul Moore <>
Subject: linux-next: manual merge of the moduleh tree with Linus' tree
Date: Tue, 25 Oct 2011 19:37:31 +1100	[thread overview]
Message-ID: <> (raw)

[-- Attachment #1: Type: text/plain, Size: 835 bytes --]

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.
Stephen Rothwell          

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>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2011-10-25  8:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-25  8:37 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-09-28  6:20 linux-next: manual merge of the moduleh tree with Linus' tree Stephen Rothwell
2011-08-02  4:52 Stephen Rothwell
2011-08-02 17:17 ` Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).