Messages in this thread | | | Date | Thu, 29 Oct 2009 20:44:20 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the net/wireless tree with the staging.current tree |
| |
On Fri, Oct 30, 2009 at 02:18:00PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net tree got conflicts in > drivers/staging/rtl8187se/Kconfig and drivers/staging/rtl8192e/Kconfig > between commit a26961e914c88e3e2ed46ef67f83a33ad7b57c36 ("Staging: fix > wireless drivers depends") from the staging.current tree and commit > 125b181aec7a67c71234284ecf6d9c729d05deda ("staging: Add proper selection > of WIRELESS_EXT and WEXT_PRIV") from the net/wireless tree. > > Just context changes. I fixed it up (see below) and can carry the fix > for a while.
Thanks, the fix looks fine to me.
greg k-h
| |