linux-next: manual merge of the mips tree with the net-current tree

[Stephen Rothwell]

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

[Ralf Baechle]

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[David Miller]

From: Ralf Baechle <ra...@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.

You're not going to merge a platform_driver conversion this late
in the -rc series are you?

[Florian Fainelli]

On Tuesday 24 November 2009 04:43:43 David Miller wrote:
> From: Ralf Baechle <ra...@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

[David Miller]

From: Florian Fainelli <flo...@openwrt.org>
Date: Tue, 24 Nov 2009 12:30:22 +0100

> On Tuesday 24 November 2009 04:43:43 David Miller wrote:
>> From: Ralf Baechle <ra...@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.

But the conversion is not appropriate for 2.6.32, and since I have to push
the bug fix into 2.6.32 anyways you have to live with resolving the conflict
somehow since the bug fix by itself is going to go to Linus for 2.6.32 but
your conversion is not.