From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jesper Juhl <jj@chaosbits.net>,
David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Subject: linux-next: manual merge of the staging tree with the net tree
Date: Thu, 7 Jul 2011 15:28:57 +1000 [thread overview]
Message-ID: <20110707152857.83d48e1d1c175f811b255952@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c between commit
219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
includes") from the net tree and commit 41134db17a7d ("Remove unneeded
version.h includes from drivers/staging/rtl*/") from the staging tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 00ee02f,52a7386..0000000
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@@ -19,8 -19,6 +19,7 @@@
#include <linux/random.h>
#include <linux/delay.h>
#include <linux/slab.h>
- #include <linux/version.h>
+#include <linux/interrupt.h>
#include <asm/uaccess.h>
#include "dot11d.h"
next reply other threads:[~2011-07-07 5:29 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-07 5:28 Stephen Rothwell [this message]
2011-07-07 13:43 ` linux-next: manual merge of the staging tree with the net tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2011-10-13 5:43 Stephen Rothwell
2011-10-13 6:12 ` Greg KH
2011-10-13 9:08 ` Arend van Spriel
2011-10-06 5:04 Stephen Rothwell
2011-10-06 5:56 ` David Miller
2011-10-06 6:16 ` Stephen Rothwell
2011-10-06 4:58 Stephen Rothwell
2011-10-06 8:59 ` Arend van Spriel
2011-08-26 3:47 Stephen Rothwell
2011-08-26 4:33 ` Greg KH
2011-08-26 5:35 ` Larry Finger
2011-07-22 5:42 Stephen Rothwell
2011-07-07 5:44 Stephen Rothwell
2011-07-07 13:43 ` Greg KH
2009-09-04 7:32 Stephen Rothwell
2009-09-04 14:52 ` Greg KH
2009-07-29 6:52 Stephen Rothwell
2009-07-29 12:44 ` Greg KH
2009-07-29 13:46 ` David Miller
2009-07-29 14:17 ` Greg KH
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:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110707152857.83d48e1d1c175f811b255952@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=jj@chaosbits.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* 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).