linux-kernel - linux-next: manual merge of the mips 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: <20091124113717.c5d86d41.sfr@canb.auug.org.au>
Date:	Tue, 24 Nov 2009 11:37:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Alexander Beregalov <a.beregalov@...il.com>,
	"David S. Miller" <davem@...emloft.net>,
	Florian Fainelli <florian@...nwrt.org>
Subject: linux-next: manual merge of the mips tree with the net-current tree

Hi Ralf,

Today's linux-next merge of the mips tree got a conflict in
drivers/net/au1000_eth.c between commit
63edaf647607795a065e6956a79c47f500dc8447 ("Au1x00: fix crash when trying
register_netdev()") from the net-current tree and commit
6cdbc95856e7f4ab4e7b2f2bdab5c3844537ad83 ("NET: au1000-eth: convert to
platform_driver model") from the mips tree.

It looks to me that the mips tree change supercedes the net-current one
(since it moves the register_netdev() call much later), so I just used
this file from the mips tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped