Messages in this thread | | | Date | Thu, 25 Aug 2011 21:33:57 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the net tree |
| |
On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net: > remove use of ndo_set_multicast_list in drivers") from the net tree and > commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used") > from the staging tree. > > The latter removed the file, so I did that.
Thanks, that should be the correct thing :)
greg k-h
| |