From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Luciano Coelho <coelho@ti.com>
Subject: Re: linux-next: manual merge of the wireless tree with Linus' tree
Date: Tue, 20 Sep 2011 08:55:16 -0400 [thread overview]
Message-ID: <20110920125516.GA7800@tuxdriver.com> (raw)
In-Reply-To: <20110920132814.16d957ac9ddccb2e47ece1c2@canb.auug.org.au>
On Tue, Sep 20, 2011 at 01:28:14PM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
> add max_sched_scan_ssids value to the hw description") from Linus' tree
> and commit 221737d24f88 ("wl12xx: increase number of allowed SSIDs in
> sched_scan") from the wireless tree.
>
> I fixed it up (I used the wireless tree version) and can carry the fix as
> necessary.
>
> John, maybe you could merge the wireless-current tree (or the part of it
> that has already been merged into Linus' tree) into the wireless tree and
> fix these merge issues.
Yes, I will -- I'm trying to get resynced w/ Dave...
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-09-20 13:00 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-20 3:28 linux-next: manual merge of the wireless tree with Linus' tree Stephen Rothwell
2011-09-20 12:55 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-02-14 0:19 Stephen Rothwell
2012-01-04 1:40 Stephen Rothwell
2011-09-20 3:22 Stephen Rothwell
2011-09-19 5:14 Stephen Rothwell
2011-09-19 5:28 ` Luciano Coelho
2011-09-15 3:14 Stephen Rothwell
2011-09-15 7:17 ` Helmut Schaa
2011-09-15 3:14 Stephen Rothwell
2011-08-30 3:46 Stephen Rothwell
2011-05-12 1:42 Stephen Rothwell
2011-05-11 1:52 Stephen Rothwell
2011-04-27 1:00 Stephen Rothwell
2011-04-13 2:30 Stephen Rothwell
2011-04-08 4:10 Stephen Rothwell
2011-04-08 5:11 ` Jussi Kivilinna
2011-04-08 4:10 Stephen Rothwell
2010-09-21 2:20 Stephen Rothwell
2010-09-21 2:09 Stephen Rothwell
2010-09-21 6:53 ` Ohad Ben-Cohen
2010-09-21 8:57 ` Ohad Ben-Cohen
2010-09-21 15:08 ` John W. Linville
2010-08-17 1:52 Stephen Rothwell
2010-08-17 2:59 ` Rusty Russell
2010-08-17 3:07 ` Stephen Rothwell
2010-06-15 2:00 Stephen Rothwell
2010-06-15 14:42 ` John W. Linville
2010-05-10 1:27 Stephen Rothwell
2010-04-27 1:28 Stephen Rothwell
2010-01-06 2:29 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=20110920125516.GA7800@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=coelho@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.