From: Larry Finger <Larry.Finger@lwfinger.net>
To: Joe Perches <joe@perches.com>
Cc: Thierry Reding <thierry.reding@gmail.com>,
"John W. Linville" <linville@tuxdriver.com>,
Arend van Spriel <arend@broadcom.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: manual merge of the wireless-next tree
Date: Mon, 07 Oct 2013 11:09:00 -0500 [thread overview]
Message-ID: <5252DC9C.8090803@lwfinger.net> (raw)
In-Reply-To: <1381161393.2081.177.camel@joe-AO722>
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
next prev parent reply other threads:[~2013-10-07 16:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding
2013-10-07 15:18 ` linux-next: build failure after merge of the mips tree Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the drm-intel tree Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the random tree Thierry Reding
2013-10-07 15:18 ` Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-07 15:48 ` Larry Finger
2013-10-07 15:56 ` Joe Perches
2013-10-07 16:09 ` Larry Finger [this message]
2013-10-07 16:17 ` Joe Perches
2013-10-07 17:16 ` Larry Finger
-- strict thread matches above, loose matches on Subject: below --
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-09-30 14:26 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5252DC9C.8090803@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=arend@broadcom.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.