Messages in this thread | | | Date | Thu, 9 Jun 2011 13:51:01 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the staging.current tree |
| |
On Thu, Jun 09, 2011 at 11:41:43AM -0700, Greg KH wrote: > On Thu, Jun 09, 2011 at 04:58:08PM +1000, Stephen Rothwell wrote: > > Hi Greg, > > > > Today's linux-next merge of the staging tree got a conflict in > > drivers/staging/brcm80211/brcmfmac/wl_iw.c between commit e1c78de9a462 > > ("staging: brcm80211: fix for 'multiple definition of wl_msg_level' build > > err") from the staging.current tree and commit 8817f75429a1 ("staging: > > brcm80211: removed wl_ (vendor specific acronym)") from the staging tree. > > > > I fixed it up (using the latter change) and can carry the fix as > > necessary. > > Thanks for the fix, it sounds correct.
This should now be resolved.
greg k-h
| |