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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 13 May 2014 13:53:22 +1000

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 (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/ipv6/xfrm6_output.c
index b930d080c66f,f47c8b153dd3..000000000000
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@@ -114,7 -114,13 +114,7 @@@ int xfrm6_prepare_output(struct xfrm_st
  	if (err)
  		return err;
  
- 	skb->local_df = 1;
 -	memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
 -#ifdef CONFIG_NETFILTER
 -	IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
 -#endif
 -
 -	skb->protocol = htons(ETH_P_IPV6);
+ 	skb->ignore_df = 1;
  
  	return x->outer_mode->output2(x, skb);
  }