linux-next: manual merge of the wireless tree with the net-current tree

linux-next: manual merge of the wireless tree with the net-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the wireless tree with the net-current tree

[John W. Linville]

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!

Re: linux-next: manual merge of the wireless tree with the net-current tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 722 bytes --]

Hi John,

On Wed, 8 Jul 2009 10:04:25 -0400 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> 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.

Indeed, that is why I ignored the problem for now.  I was just flagging
that the issue will need to be resolved at some point.  (Although I am
assuming that ignoring the fix in net-current does not produce too much
bad fallout right now.)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]