Received-SPF: pass (google.com: domain of linux-kernel+bounces-127180-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Tue, 2 Apr 2024 10:32:53 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>,
 Paolo Abeni <pabeni@redhat.com>
Cc: Networking <netdev@vger.kernel.org>, Alexander Lobakin
 <aleksander.lobakin@intel.com>, Eric Dumazet <edumazet@google.com>, Linux
 Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the net tree
Message-ID: <20240402103253.3b54a1cf@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4cCA5Hw1boWFJmaQY2dnncK";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/4cCA5Hw1boWFJmaQY2dnncK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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 =3D ip_hdr(skb);
  	if (is_erspan_type1(gre_hdr_len)) {
  		ver =3D 0;
- 		tunnel =3D ip_tunnel_lookup(itn, skb->dev->ifindex,
- 					  tpi->flags | TUNNEL_NO_KEY,
+ 		__set_bit(IP_TUNNEL_NO_KEY_BIT, flags);
+ 		tunnel =3D 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 =3D (struct erspan_base_hdr *)(skb->data + gre_hdr_len);
  		ver =3D ershdr->ver;
 +		iph =3D ip_hdr(skb);
- 		tunnel =3D ip_tunnel_lookup(itn, skb->dev->ifindex,
- 					  tpi->flags | TUNNEL_KEY,
+ 		__set_bit(IP_TUNNEL_KEY_BIT, flags);
+ 		tunnel =3D ip_tunnel_lookup(itn, skb->dev->ifindex, flags,
  					  iph->saddr, iph->daddr, tpi->key);
  	}
 =20

--Sig_/4cCA5Hw1boWFJmaQY2dnncK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYLRCUACgkQAVBC80lX
0Gx0XQf9HXhr1nHFOqTHOJ8OYptgp7GXzTXCpZoEqPBYBLQ39wLFon1ufsFDT+Yb
Vk8X6DR7Ak4TFDmt/Flzb8xdEEspsIVumLmH+RCBC8mYToM/yJyldIMD89v2fmuk
uUK6dpM6WpNKsKUBasSIRMi3Uu0jryi7DvAmmP4DunKiRfpCxNwrDbljUu6sWRKk
x7lOxJhbw/ctBE6RiNLKG27jNrHR5UtCVg2zJp8hmo3mqkC8vLBxH/sRpV8K4Xxq
uZIZIkDeEN7kahTaK4RashI4hjfg+Et1tFIrAO/oFjeOBiuA2sxgTA0BqzrNxW1V
3XOTE8xhVeDjBeLGSzkt/ZbfHDK0lA==
=5j3D
-----END PGP SIGNATURE-----

--Sig_/4cCA5Hw1boWFJmaQY2dnncK--