Messages in this thread | | | Date | Wed, 27 Apr 2011 20:06:01 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with Linus' tree |
| |
On Thu, Apr 28, 2011 at 12:59:13PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/rt2860/common/cmm_data_pci.c > drivers/staging/rt2860/common/cmm_data_usb.c between commit e9c549998dc2 > ("Revert wrong fixes for common misspellings") from Linus' tree and > commit fefecc6989b4 ("staging: rt2860sta and rt2870sta: Remove drivers > replaced in net/wireless") from the staging tree. > > The files modified by the former were removed by the latter, so I did > that.
Thanks, that is correct.
greg k-h
| |