Messages in this thread | | | Subject | Re: linux-next: manual merge of the wireless-next tree | From | Joe Perches <> | Date | Mon, 07 Oct 2013 08:56:33 -0700 |
| |
On Mon, 2013-10-07 at 10:48 -0500, Larry Finger wrote: > On 10/07/2013 10:18 AM, Thierry Reding wrote: > > Today's linux-next merge of the wireless-next tree got conflicts in: > > > > drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h > > drivers/net/wireless/rtlwifi/rtl8188ee/phy.h > > drivers/net/wireless/rtlwifi/rtl8192ce/phy.h > > drivers/net/wireless/rtlwifi/rtl8192de/phy.h > > drivers/net/wireless/rtlwifi/rtl8723ae/phy.h [] > Yes, the patches for rtlwifi problems are correct. All of these problems would > have been avoided if changes to wireless drivers were sent to the wireless tree > rather than direct submission to net-next!!!!
They were and you acked it. https://lkml.org/lkml/2013/9/25/589
Who picks it up first and applies it is not in my domain.
| |