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
| ||
|
Date: Tue, 13 May 2014 00:07:53 -0400 (EDT) From: David Miller <davem@...emloft.net> To: sfr@...b.auug.org.au Cc: netdev@...r.kernel.org, steffen.klassert@...unet.com, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, xiyou.wangcong@...il.com Subject: Re: linux-next: manual merge of the net-next tree with the ipsec tree From: Stephen Rothwell <sfr@...b.auug.org.au> Date: Tue, 13 May 2014 13:53:22 +1000 > Today's linux-next merge of the net-next tree got a conflict in > net/ipv6/xfrm6_output.c between commit 5596732fa8c1 ("xfrm: Fix crash > with ipv6 IPsec tunnel and NAT") from the ipsec tree and commit > 60ff746739bf ("net: rename local_df to ignore_df") from the net-next > tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Looks good to me, thanks Stephen. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists