From mboxrd@z Thu Jan 1 00:00:00 1970 From: Larry Finger Subject: Re: linux-next: manual merge of the wireless-next tree Date: Mon, 07 Oct 2013 11:09:00 -0500 Message-ID: <5252DC9C.8090803@lwfinger.net> References: <1381159127-11067-1-git-send-email-treding@nvidia.com> <1381159127-11067-5-git-send-email-treding@nvidia.com> <5252D7E4.2050509@lwfinger.net> <1381161393.2081.177.camel@joe-AO722> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ie0-f180.google.com ([209.85.223.180]:46327 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752168Ab3JGQJE (ORCPT ); Mon, 7 Oct 2013 12:09:04 -0400 In-Reply-To: <1381161393.2081.177.camel@joe-AO722> Sender: linux-next-owner@vger.kernel.org List-ID: To: Joe Perches Cc: Thierry Reding , "John W. Linville" , Arend van Spriel , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 10/07/2013 10:56 AM, Joe Perches wrote: > 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. Fair enough. I should have asked DaveM to let John apply those changes. Larry