From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
johannes@sipsolutions.net, tomas.winkler@intel.com,
reinette.chatre@intel.com, yi.zhu@intel.com
Subject: Re: linux-next: manual merge of the wireless tree
Date: Thu, 20 Nov 2008 08:48:09 -0500 [thread overview]
Message-ID: <20081120134808.GA4329@tuxdriver.com> (raw)
In-Reply-To: <20081120.002705.95132527.davem@davemloft.net>
On Thu, Nov 20, 2008 at 12:27:05AM -0800, David Miller wrote:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Thu, 20 Nov 2008 14:07:50 +1100
>
> > Today's linux-next merge of the wireless tree got a conflict in
> > drivers/net/wireless/iwlwifi/iwl-rx.c between commit
> > 4018517a1a69a85c3d61b20fa02f187b80773137 ("iwlagn: fix RX skb alignment")
> > from the wireless-current tree and commit
> > 07e27f25d0c73f42562473f642f20b8fa996a9de ("iwlwifi: move rx queue read
> > pointer into rxq") from the wireless tree.
> >
> > I wasn't sure how to resolve the conflict so have dropped the wireless
> > tree for today. I assume it will be fixed in the wireless (or net) tree
> > soon.
>
> I'll sort these out with John somehow, thanks for the report
> Stephen,
I have all these sorted (including the ieee80211_notify_mac one)
in the merge-test branch of wireless-next-2.6.
John
--
John W. Linville Linux should be at the core
linville@tuxdriver.com of your literate lifestyle.
next prev parent reply other threads:[~2008-11-20 14:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-20 3:07 linux-next: manual merge of the wireless tree Stephen Rothwell
2008-11-20 8:27 ` David Miller
2008-11-20 13:48 ` John W. Linville [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-11-26 8:40 Stephen Rothwell
2008-12-02 20:52 ` Luis R. Rodriguez
2008-09-17 7:43 Stephen Rothwell
2008-09-17 7:45 ` Johannes Berg
2008-07-03 4:43 Stephen Rothwell
2008-07-03 4:38 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=20081120134808.GA4329@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=johannes@sipsolutions.net \
--cc=linux-next@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=tomas.winkler@intel.com \
--cc=yi.zhu@intel.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.