* Re: linux-next: manual merge of the mips tree with the net-current tree [not found] <20091124113717.c5d86d41.sfr@canb.auug.org.au> @ 2009-11-24 1:19 ` Ralf Baechle 2009-11-24 3:43 ` David Miller 0 siblings, 1 reply; 4+ messages in thread From: Ralf Baechle @ 2009-11-24 1:19 UTC (permalink / raw) To: Stephen Rothwell Cc: linux-next, linux-kernel, Alexander Beregalov, David S. Miller, Florian Fainelli, linux-mips, Manuel Lauss 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the mips tree with the net-current tree 2009-11-24 1:19 ` linux-next: manual merge of the mips tree with the net-current tree Ralf Baechle @ 2009-11-24 3:43 ` David Miller 2009-11-24 11:30 ` Florian Fainelli 0 siblings, 1 reply; 4+ messages in thread From: David Miller @ 2009-11-24 3:43 UTC (permalink / raw) To: ralf Cc: sfr, linux-next, linux-kernel, a.beregalov, florian, linux-mips, manuel.lauss 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. You're not going to merge a platform_driver conversion this late in the -rc series are you? ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the mips tree with the net-current tree 2009-11-24 3:43 ` David Miller @ 2009-11-24 11:30 ` Florian Fainelli 2009-11-24 18:02 ` David Miller 0 siblings, 1 reply; 4+ messages in thread From: Florian Fainelli @ 2009-11-24 11:30 UTC (permalink / raw) To: David Miller Cc: ralf, sfr, linux-next, linux-kernel, a.beregalov, linux-mips, manuel.lauss 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 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the mips tree with the net-current tree 2009-11-24 11:30 ` Florian Fainelli @ 2009-11-24 18:02 ` David Miller 0 siblings, 0 replies; 4+ messages in thread From: David Miller @ 2009-11-24 18:02 UTC (permalink / raw) To: florian Cc: ralf, sfr, linux-next, linux-kernel, a.beregalov, linux-mips, manuel.lauss From: Florian Fainelli <florian@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 <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. 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. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-24 18:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20091124113717.c5d86d41.sfr@canb.auug.org.au>
2009-11-24 1:19 ` linux-next: manual merge of the mips tree with the net-current tree Ralf Baechle
2009-11-24 3:43 ` David Miller
2009-11-24 11:30 ` Florian Fainelli
2009-11-24 18:02 ` David Miller
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).