| To: | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Subject: | Re: linux-next: manual merge of the mips tree with the net-current tree |
| From: | Ralf Baechle <ralf@linux-mips.org> |
| Date: | Tue, 24 Nov 2009 01:19:58 +0000 |
| Cc: | linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Beregalov <a.beregalov@gmail.com>, "David S. Miller" <davem@davemloft.net>, Florian Fainelli <florian@openwrt.org>, linux-mips@linux-mips.org, Manuel Lauss <manuel.lauss@googlemail.com> |
| In-reply-to: | <20091124113717.c5d86d41.sfr@canb.auug.org.au> |
| Original-recipient: | rfc822;linux-mips@linux-mips.org |
| References: | <20091124113717.c5d86d41.sfr@canb.auug.org.au> |
| Sender: | linux-mips-bounce@linux-mips.org |
| User-agent: | Mutt/1.5.19 (2009-01-05) |
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.
Ralf
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: linux-next: failed to fetch the mips tree, Ralf Baechle |
|---|---|
| Next by Date: | Re: Disable EARLY_PRINTK on IP22 to make the system boot, Ralf Baechle |
| Previous by Thread: | Re: linux-next: failed to fetch the mips tree, Ralf Baechle |
| Next by Thread: | Re: linux-next: manual merge of the mips tree with the net-current tree, David Miller |
| Indexes: | [Date] [Thread] [Top] [All Lists] |