From: Larry Finger <Larry.Finger@lwfinger•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: "John W. Linville" <linville@tuxdriver•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Rusty Russell <rusty@rustcorp•com.au>,
David Miller <davem@davemloft•net>,
netdev@vger•kernel.org
Subject: Re: linux-next: manual merge of the wireless-next tree with the net-next tree
Date: Wed, 04 Jan 2012 21:12:29 -0600 [thread overview]
Message-ID: <4F05151D.5070401@lwfinger.net> (raw)
In-Reply-To: <20120105140405.92816482d364abfcf3854d74@canb.auug.org.au>
On 01/04/2012 09:04 PM, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/b43legacy/dma.c between commit 3db1cd5c05f3 ("net:
> fix assignment of 0/1 to bool variables") from the net-next tree and
> commit 5d07a3d62f63 ("b43legacy: Avoid packet losses in the dma worker
> code") from the wireless-next tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Is there a good explanation why changes in wireless drivers are sent to
net-next, and not wireless-testing? If that were stopped, this kind of conflict
would be avoided.
Larry
next prev parent reply other threads:[~2012-01-05 3:12 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 3:04 linux-next: manual merge of the wireless-next tree with the net-next tree Stephen Rothwell
2012-01-05 3:12 ` Larry Finger [this message]
2012-01-05 3:30 ` David Miller
2012-01-05 3:45 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-10-11 1:10 Stephen Rothwell
2014-03-07 1:07 Stephen Rothwell
2013-09-27 3:19 Stephen Rothwell
2013-06-27 4:23 Stephen Rothwell
2013-06-27 7:34 ` Berg, Johannes
2013-06-04 2:33 Stephen Rothwell
2013-02-11 2:33 Stephen Rothwell
2013-02-11 2:58 ` Joe Perches
2013-02-11 6:47 ` Luciano Coelho
2013-02-11 7:40 ` Stephen Rothwell
2013-02-11 7:53 ` Luciano Coelho
2012-06-28 2:40 Stephen Rothwell
2012-05-03 1:31 Stephen Rothwell
2012-05-03 1:35 ` David Miller
2012-04-24 2:48 Stephen Rothwell
2012-04-24 5:07 ` Grumbach, Emmanuel
2012-04-16 2:49 Stephen Rothwell
2012-04-16 2:49 Stephen Rothwell
2012-04-16 2:48 Stephen Rothwell
2012-04-13 2:41 Stephen Rothwell
2012-04-13 2:49 ` Stephen Rothwell
2012-04-13 2:30 Stephen Rothwell
2012-04-13 2:51 ` Stephen Rothwell
2012-04-11 2:56 Stephen Rothwell
2012-04-10 1:32 Stephen Rothwell
2012-03-16 1:58 Stephen Rothwell
2012-02-01 2:39 Stephen Rothwell
2011-12-21 11:59 Stephen Rothwell
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=4F05151D.5070401@lwfinger.net \
--to=larry.finger@lwfinger$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox