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: <1330485702.2512.22.camel@bwh-desktop> Date: Wed, 29 Feb 2012 03:21:42 +0000 From: Ben Hutchings <bhutchings@...arflare.com> To: David Miller <davem@...emloft.net> CC: <sfr@...b.auug.org.au>, <netdev@...r.kernel.org>, <linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree On Sun, 2012-02-26 at 23:05 -0500, David Miller wrote: > From: Stephen Rothwell <sfr@...b.auug.org.au> > Date: Mon, 27 Feb 2012 12:11:25 +1100 > > > Today's linux-next merge of the net-next tree got a conflict in > > drivers/net/ethernet/sfc/rx.c between commit ff3bc1e75275 ("sfc: Fix > > assignment of ip_summed for pre-allocated skbs") from Linus' tree and > > commit db3395697cad ("sfc: Replace efx_rx_buffer::is_page and other > > booleans with a flags field") from the net-next tree. > > > > Just context changes. I fixed it up (see below) and can carry the fix as > > necessary. > > I just merged net into net-next and resolved this conflict. Thank you both. I should have flagged this when sending the change for the net tree. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. -- 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