From: Florian Fainelli <florian@openwrt.org>
To: David Miller <davem@davemloft.net>
Cc: ralf@linux-mips.org, sfr@canb.auug.org.au,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
a.beregalov@gmail.com, linux-mips@linux-mips.org,
manuel.lauss@googlemail.com
Subject: Re: linux-next: manual merge of the mips tree with the net-current tree
Date: Tue, 24 Nov 2009 12:30:22 +0100 [thread overview]
Message-ID: <200911241230.22370.florian@openwrt.org> (raw)
In-Reply-To: <20091123.194343.232255103.davem@davemloft.net>
On Tuesday 24 November 2009 04:43:43 David Miller wrote:
> From: Ralf Baechle <ralf@linux-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.
Ok, it is, but the platform_driver conversion patch is heavier, so the bugfix
is way easier to apply on thom of the conversion.
--
WBR, Florian
next prev parent reply other threads:[~2009-11-24 11:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 0:37 linux-next: manual merge of the mips tree with the net-current tree Stephen Rothwell
2009-11-24 1:19 ` Ralf Baechle
2009-11-24 3:43 ` David Miller
2009-11-24 11:30 ` Florian Fainelli [this message]
2009-11-24 18:02 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200911241230.22370.florian@openwrt.org \
--to=florian@openwrt.org \
--cc=a.beregalov@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-next@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).