From: "John W. Linville" <linville@tuxdriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org,
Johannes Berg <johannes@sipsolutions.net>
Subject: Re: linux-next: manual merge of the net tree with the wireless-current tree
Date: Tue, 1 Dec 2009 09:06:58 -0500 [thread overview]
Message-ID: <20091201140658.GA11031@tuxdriver.com> (raw)
In-Reply-To: <20091201123142.fe6bc824.sfr@canb.auug.org.au>
On Tue, Dec 01, 2009 at 12:31:42PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net tree got a conflict in net/mac80211/ht.c between commit 827d42c9ac91ddd728e4f4a31fefb906ef2ceff7 ("mac80211: fix spurious delBA handling") from the wireless-current tree and commit c951ad3550ab40071bb0f222ba6125845769c08a ("mac80211: convert aggregation to operate on vifs/stas") from the net tree.
>
> I fixed it up (by using the version from the wireless-current tree) and
> can carry the fix as necessary. This may well not be correct.
That sounds like the correct fix...thanks!
--
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:[~2009-12-01 14:15 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-01 1:31 linux-next: manual merge of the net tree with the wireless-current tree Stephen Rothwell
2009-12-01 1:31 ` Stephen Rothwell
2009-12-01 14:06 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-09-27 2:51 Stephen Rothwell
2011-09-27 2:51 ` Stephen Rothwell
2011-09-27 13:09 ` John W. Linville
2011-09-27 14:41 ` wwguy
2011-07-06 2:53 Stephen Rothwell
2011-07-06 2:53 ` Stephen Rothwell
2011-07-06 11:07 ` Gustavo Padovan
2011-06-28 4:02 Stephen Rothwell
2011-06-28 4:02 ` Stephen Rothwell
2011-06-28 14:57 ` Guy, Wey-Yi
2010-12-02 23:45 Stephen Rothwell
2010-12-02 23:45 ` Stephen Rothwell
2010-05-12 2:15 Stephen Rothwell
2010-05-12 2:15 ` Stephen Rothwell
2010-05-12 16:15 ` reinette chatre
2010-05-13 1:02 ` Stephen Rothwell
2010-05-13 1:02 ` Stephen Rothwell
2010-03-30 2:37 Stephen Rothwell
2010-03-30 2:37 ` Stephen Rothwell
2010-03-30 13:12 ` John W. Linville
2010-03-30 13:51 ` Stephen Rothwell
2010-02-15 4:20 Stephen Rothwell
2010-02-15 4:20 ` Stephen Rothwell
2010-02-15 6:22 ` David Miller
2010-02-15 7:16 ` Stephen Rothwell
2010-02-09 2:24 Stephen Rothwell
2010-02-09 2:24 ` Stephen Rothwell
2010-02-09 3:20 ` John W. Linville
2010-01-07 2:12 Stephen Rothwell
2010-01-07 2:12 ` Stephen Rothwell
2010-01-06 2:25 Stephen Rothwell
2010-01-06 2:25 ` Stephen Rothwell
2009-12-28 22:54 Stephen Rothwell
2009-12-28 22:54 ` Stephen Rothwell
2009-12-28 23:41 ` John W. Linville
2009-11-26 3:10 Stephen Rothwell
2009-11-26 3:10 ` Stephen Rothwell
2009-11-26 9:33 ` Johannes Berg
2009-11-26 13:01 ` John W. Linville
2009-11-30 16:48 ` Jean Tourrilhes
2009-07-28 1:59 Stephen Rothwell
2009-07-28 1:53 Stephen Rothwell
2009-07-22 2:00 Stephen Rothwell
2009-07-22 14:03 ` John W. Linville
2009-07-22 1:59 Stephen Rothwell
2009-07-22 2:05 ` Zhu Yi
2009-07-22 4:50 ` Stephen Rothwell
2009-07-22 3:04 ` David Miller
2009-04-30 1:33 Stephen Rothwell
2009-04-30 2:16 ` John W. Linville
2009-04-30 3:23 ` David Miller
2009-04-29 3:51 Stephen Rothwell
2009-04-29 12:42 ` John W. Linville
2009-04-29 13:24 ` Stephen Rothwell
2009-03-24 2:37 Stephen Rothwell
2009-03-06 3:55 Stephen Rothwell
2009-02-19 5:23 Stephen Rothwell
2009-02-19 5:23 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=20091201140658.GA11031@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@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.