linux-next: manual merge of the net-next tree with the ipsec tree

2015-10-05 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv6/xfrm6_output.c between commit: 93efac3f2e03 ("ipv6: Fix IPsec pre-encap fragmentation check") from the ipsec tree and commit: 7d8c6e391575 ("ipv6: Pass struct net through ip6_fragment") from the net-next

Re: linux-next: manual merge of the net-next tree with the ipsec tree

2014-05-12 Thread David Miller
From: Stephen Rothwell 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 loc

Re: linux-next: manual merge of the net-next tree with the ipsec tree

2014-05-12 Thread Cong Wang
On Mon, May 12, 2014 at 8:53 PM, Stephen Rothwell wrote: > Hi all, > > 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: ren

linux-next: manual merge of the net-next tree with the ipsec tree

2014-05-12 Thread Stephen Rothwell
Hi all, 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 (s