Messages in this thread | | | Date | Sun, 11 Mar 2012 15:56:21 -0700 (PDT) | Subject | Re: linux-next: manual merge of the net-next tree with the powerpc tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Fri, 9 Mar 2012 17:44:16 +1100
> On Thu, 08 Mar 2012 22:15:34 -0800 (PST) David Miller <davem@davemloft.net> wrote: >> >> From: Stephen Rothwell <sfr@canb.auug.org.au> >> Date: Fri, 9 Mar 2012 13:36:46 +1100 >> >> > Today's linux-next merge of the net-next tree got a conflict in >> > drivers/net/ethernet/ibm/iseries_veth.c between commit e92a665949f6 >> > ("net: powerpc: remove the legacy iSeries ethernet driver") from the >> > powerpc tree and commit 41de8d4cff21 ("drivers/net: Remove alloc_etherdev >> > error messages") from the net-next tree. >> > >> > I just removed the file. >> >> If it makes life easier for anyone I can put the driver removal patch >> into net-next. > > In this case, I think it will actually help, thanks. Note that it won;t > apply cleanly to your tree, but the fixup is easy :-) > > And I discovered that "git am" doesn't like the style of patch I did > (without the body of the deleted file). If you just delete > drivers/net/ethernet/ibm/iseries_veth.c before trying to apply the patch > it will probably work.
I took care of this the other night.
| |