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,
"David S. Miller" <davem@davemloft•net>
Subject: Re: linux-next: manual merge of the wireless tree with the net-current tree
Date: Wed, 8 Jul 2009 10:04:25 -0400 [thread overview]
Message-ID: <20090708140425.GE4253@tuxdriver.com> (raw)
In-Reply-To: <20090708124005.ecbf2907.sfr@canb.auug.org.au>
On Wed, Jul 08, 2009 at 12:40:05PM +1000, Stephen Rothwell wrote:
> Hi John,
>
> Today's linux-next merge of the wireless tree got a conflict in
> drivers/net/wireless/p54/p54common.c between commit
> 0ca1b08eba627b4245efd0f71b55a062bf163777 ("Revert "p54: Use SKB list
> handling helpers instead of by-hand code."") from the net-current tree
> and commit 373234a7c69600397aea39c1452806736df2dfc5 ("p54: Modify p54
> files for new organization") from the wireless tree.
>
> For today, I just ignored the net-current change. This will need fixing.
There is some code reorganization happening in wireless-next-2.6,
resulting in a couple of files getting deleted. I'm guessing that
if/when Dave pulls net-2.6 into net-next-2.6 (which wireless-next-2.6
gets rebased upon) then this should resolve itself.
Hth!
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver•com might be all we have. Be ready.
¡Viva Honduras Libre!
next prev parent reply other threads:[~2009-07-08 14:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-08 2:40 linux-next: manual merge of the wireless tree with the net-current tree Stephen Rothwell
2009-07-08 14:04 ` John W. Linville [this message]
2009-07-08 23:42 ` 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=20090708140425.GE4253@tuxdriver.com \
--to=linville@tuxdriver$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--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