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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 8 Jul 2009 10:04:25 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>
Subject: Re: linux-next: manual merge of the wireless tree with the
	net-current tree

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@...driver.com			might be all we have.  Be ready.
			¡Viva Honduras Libre!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/