linux-next: net merge conflict

linux-next: net merge conflict

[Stephen Rothwell]

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

Hi Dave, John,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/rt2x00/rt61pci.c (at the end of rt61pci_beacon_update())
between commit 78720897459a0ed3843c80e9bd9ef1b2f7ae5c8f ("rt2x00:
Don't use pskb_expand_head()") in the net-current/wireless-current trees
and commit e58c6aca99357d7f85f18e0b661d8c5a87f926a9 ("rt2x00: Use rt2x00
queue numbering") in the net/wireless trees.

I think I did the right fixup, but it is probably worth checking.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: net merge conflict

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 May 2008 14:54:25 +1000

> Hi Dave, John,
> 
> Today's linux-next merge of the net tree got a conflict in
> drivers/net/wireless/rt2x00/rt61pci.c (at the end of rt61pci_beacon_update())
> between commit 78720897459a0ed3843c80e9bd9ef1b2f7ae5c8f ("rt2x00:
> Don't use pskb_expand_head()") in the net-current/wireless-current trees
> and commit e58c6aca99357d7f85f18e0b661d8c5a87f926a9 ("rt2x00: Use rt2x00
> queue numbering") in the net/wireless trees.
> 
> I think I did the right fixup, but it is probably worth checking.

John did an example merge which likely matches what
you did:

	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merge-test