lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20120311.155621.699600599796181447.davem@davemloft.net> Date: Sun, 11 Mar 2012 15:56:21 -0700 (PDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, benh@...nel.crashing.org, paulus@...ba.org, linuxppc-dev@...ts.ozlabs.org, joe@...ches.com Subject: Re: linux-next: manual merge of the net-next tree with the powerpc tree From: Stephen Rothwell <sfr@...b.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@...emloft.net> wrote: >> >> From: Stephen Rothwell <sfr@...b.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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists