Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/ipv4/ip_gre.c

between commit:

  17af420545a7 ("erspan: make sure erspan_base_hdr is present in skb->head")

from the net tree and commit:

  5832c4a77d69 ("ip_tunnel: convert __be16 tunnel flags to bitmaps")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/ipv4/ip_gre.c
index 57ddcd8c62f6,3c46a7fef8db..000000000000
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
@@@ -276,19 -279,14 +279,19 @@@ static int erspan_rcv(struct sk_buff *s
  	iph = ip_hdr(skb);
  	if (is_erspan_type1(gre_hdr_len)) {
  		ver = 0;
- 		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex,
- 					  tpi->flags | TUNNEL_NO_KEY,
+ 		__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);
+ 		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, flags,
  					  iph->saddr, iph->daddr, 0);
  	} else {
 +		if (unlikely(!pskb_may_pull(skb,
 +					    gre_hdr_len + sizeof(*ershdr))))
 +			return PACKET_REJECT;
 +
  		ershdr = (struct erspan_base_hdr *)(skb->data + gre_hdr_len);
  		ver = ershdr->ver;
 +		iph = ip_hdr(skb);
- 		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex,
- 					  tpi->flags | TUNNEL_KEY,
+ 		__set_bit(IP_TUNNEL_KEY_BIT, flags);
+ 		tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, flags,
  					  iph->saddr, iph->daddr, tpi->key);
  	}