linux-kernel - 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-next>] [day] [month] [year] [list]

Message-Id: <20090708124005.ecbf2907.sfr@canb.auug.org.au>
Date:	Wed, 8 Jul 2009 12:40:05 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"John W. Linville" <linville@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>
Subject: linux-next: manual merge of the wireless tree with the net-current
 tree

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

Content of type "application/pgp-signature" skipped