archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <>
To: Paul Gortmaker <>
	Franky Lin <>,
	Arend van Spriel <>, Greg KH <>
Subject: linux-next: manual merge of the moduleh tree with the staging tree
Date: Wed, 28 Sep 2011 16:40:57 +1000	[thread overview]
Message-ID: <> (raw)

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/brcm80211/brcmfmac/bcmsdh.c between commit 47b4c640b849
("staging: brcm80211: remove global var gInstance from brcmfmac") from
the staging tree and commit 15f310ea9641 ("staging: Add export.h for
THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh

I fixed it up (see below) and can carry the fix as necessary.
Stephen Rothwell          

diff --cc drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 8448b8b,51f9335..0000000
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@@ -21,9 -22,7 +22,10 @@@
  #include <linux/pci_ids.h>
  #include <linux/sched.h>
  #include <linux/completion.h>
 +#include <linux/mmc/sdio.h>
 +#include <linux/mmc/sdio_func.h>
 +#include <linux/mmc/card.h>
+ #include <linux/export.h>
  #include <defs.h>
  #include <brcm_hw_ids.h>

             reply	other threads:[~2011-09-28  6:41 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-28  6:40 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-10-13  6:20 linux-next: manual merge of the moduleh tree with the staging tree Stephen Rothwell
2011-10-06  5:31 Stephen Rothwell
2011-09-29  5:55 Stephen Rothwell
2011-09-29 15:15 ` Paul Gortmaker
2011-09-28  6:44 Stephen Rothwell
2011-09-28  6:48 ` Stephen Rothwell
2011-09-28 14:56   ` Paul Gortmaker
2011-08-24  5:00 Stephen Rothwell

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).