* linux-next: manual merge of the staging tree with the trivial and net trees
@ 2011-06-21 5:10 Stephen Rothwell
2011-06-21 22:40 ` Vitaliy Ivanov
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2011-06-21 5:10 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Vitaliy Ivanov, Jiri Kosina,
David Miller, netdev
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e44ba033c565
("treewide: remove duplicate includes") from the trivial tree, commit
219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
includes") from the net tree and various commits from the staging tree.
I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/brcm80211/brcmfmac/wl_iw.c
index 53e6a10,9e4b087..0000000
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@@ -16,21 -16,30 +16,30 @@@
#include <linux/kthread.h>
#include <linux/semaphore.h>
- #include <bcmdefs.h>
+ #include <defs.h>
#include <linux/netdevice.h>
+#include <linux/hardirq.h>
- #include <wlioctl.h>
- #include <bcmutils.h>
+ #include <linux/etherdevice.h>
+ #include <linux/wireless.h>
+#include <linux/if_arp.h>
- #include <asm/uaccess.h>
+#include <linux/ieee80211.h>
+
++#include <asm/uaccess.h>
+
+ #include <brcmu_utils.h>
+ #include <brcmu_wifi.h>
+
-#include <linux/if_arp.h>
-#include <asm/uaccess.h>
-
#include <dngl_stats.h>
#include <dhd.h>
- #include <dhdioctl.h>
-#include <linux/ieee80211.h>
+
+ struct si_pub;
-#include <dngl_stats.h>
-#include <dhd.h>
+typedef const struct si_pub si_t;
+ #define WPA_OUI "\x00\x50\xF2"
+ #define DOT11_MNG_RSN_ID 48
+ #define DOT11_MNG_WPA_ID 221
+
#define WL_ERROR(fmt, args...) printk(fmt, ##args)
#define WL_TRACE(fmt, args...) no_printk(fmt, ##args)
#define WL_INFORM(fmt, args...) no_printk(fmt, ##args)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial and net trees
2011-06-21 5:10 linux-next: manual merge of the staging tree with the trivial and net trees Stephen Rothwell
@ 2011-06-21 22:40 ` Vitaliy Ivanov
2011-06-22 0:10 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Vitaliy Ivanov @ 2011-06-21 22:40 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Jiri Kosina, David Miller, netdev
Stephen,
On Tue, Jun 21, 2011 at 8:10 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e44ba033c565
> ("treewide: remove duplicate includes") from the trivial tree, commit
> 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> includes") from the net tree and various commits from the staging tree.
>
> I fixed them up (see below) and can carry the fix as necessary.
This one and all the others look good to me.
Vitaliy
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the staging tree with the trivial and net trees
2011-06-21 22:40 ` Vitaliy Ivanov
@ 2011-06-22 0:10 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2011-06-22 0:10 UTC (permalink / raw)
To: Vitaliy Ivanov
Cc: Stephen Rothwell, linux-next, linux-kernel, Jiri Kosina,
David Miller, netdev
On Wed, Jun 22, 2011 at 01:40:48AM +0300, Vitaliy Ivanov wrote:
> Stephen,
>
> On Tue, Jun 21, 2011 at 8:10 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the staging tree got a conflict in
> > drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e44ba033c565
> > ("treewide: remove duplicate includes") from the trivial tree, commit
> > 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> > includes") from the net tree and various commits from the staging tree.
> >
> > I fixed them up (see below) and can carry the fix as necessary.
>
> This one and all the others look good to me.
Me too, thanks for doing this.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-06-22 0:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-21 5:10 linux-next: manual merge of the staging tree with the trivial and net trees Stephen Rothwell
2011-06-21 22:40 ` Vitaliy Ivanov
2011-06-22 0:10 ` Greg KH
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).