linux-kernel - Re: 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20091123.194343.232255103.davem@davemloft.net>
Date:	Mon, 23 Nov 2009 19:43:43 -0800 (PST)
From:	David Miller <davem@...emloft.net>
To:	ralf@...ux-mips.org
Cc:	sfr@...b.auug.org.au, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, a.beregalov@...il.com,
	florian@...nwrt.org, linux-mips@...ux-mips.org,
	manuel.lauss@...glemail.com
Subject: Re: linux-next: manual merge of the mips tree with the net-current
 tree

From: Ralf Baechle <ralf@...ux-mips.org>
Date: Tue, 24 Nov 2009 01:19:58 +0000

> On Tue, Nov 24, 2009 at 11:37:17AM +1100, Stephen Rothwell wrote:
> 
>> 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.
> 
> I agree.  David, can you just drop the net-current patch then?  This fix
> is still needed for -stable however.

Why would I do that?  The bug fix is necessary for 2.6.32 too.

You're not going to merge a platform_driver conversion this late
in the -rc series are you?
--
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/