Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 2 Jun 2020 09:20:40 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     "David S. Miller" <davem@davemloft.net>
Cc:     Steffen Klassert <steffen.klassert@secunet.com>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        David Ahern <dsahern@gmail.com>,
        Florian Westphal <fw@strlen.de>
Subject: Re: linux-next: manual merge of the ipsec-next tree with Linus'
 tree
Message-ID: <20200602092040.5ef52300@canb.auug.org.au>
In-Reply-To: <20200511130015.37103884@canb.auug.org.au>
References: <20200511130015.37103884@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/TkH89WJytnR288K=Gm+4mTy";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/TkH89WJytnR288K=Gm+4mTy
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Dave,

On Mon, 11 May 2020 13:00:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the ipsec-next tree got conflicts in:
>=20
>   net/ipv4/xfrm4_output.c
>   net/ipv6/xfrm6_output.c
>=20
> between commit:
>=20
>   0c922a4850eb ("xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_fi=
nish")
>=20
> from Linus' tree and commit:
>=20
>   2ab6096db2f1 ("xfrm: remove output_finish indirection from xfrm_state_a=
finfo")
>=20
> from the ipsec-next tree.
>=20
> I fixed it up (I used the latter versions of these files and then added
> the following patch) 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
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 11 May 2020 12:57:24 +1000
> Subject: [PATCH] xfrm: merge fixup for "remove output_finish indirection =
from xfrm_state_afinfo"
>=20
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  net/xfrm/xfrm_output.c | 4 ----
>  1 file changed, 4 deletions(-)
>=20
> diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
> index 886a9b284b3a..0f4b3a5e02ba 100644
> --- a/net/xfrm/xfrm_output.c
> +++ b/net/xfrm/xfrm_output.c
> @@ -574,16 +574,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *sk=
b)
>  	switch (x->outer_mode.family) {
>  	case AF_INET:
>  		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
> -#ifdef CONFIG_NETFILTER
>  		IPCB(skb)->flags |=3D IPSKB_XFRM_TRANSFORMED;
> -#endif
>  		break;
>  	case AF_INET6:
>  		memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
> =20
> -#ifdef CONFIG_NETFILTER
>  		IP6CB(skb)->flags |=3D IP6SKB_XFRM_TRANSFORMED;
> -#endif
>  		break;
>  	}
> =20

It looks like this merge resolution fix up was missed when the
ipsec-next tree was merged into the net-next tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/TkH89WJytnR288K=Gm+4mTy
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7VjUgACgkQAVBC80lX
0GxFUgf7BVP8TUGqwFITcohFkSvSY2BCjRPAirE2bJHgWC23rDFlNDUBQprmEbF+
7jJEe+X9lggKAp94xG/w2oBqKbHGOhe5e4ZakSNaCL6WccU+SjO8F2WppOgCeBgM
rOYYVVzS7QYmM7YP4hJzSU+yCT9ouc446zp2AxltRkWrhg4uXmFwZZIpl6MgeNOD
alAmkjLl12qisgY5n9aGP05srEwiHMKJsVpxB3+NLlghjGkjLSPRAv3jLr9dfGlN
2raQn/Qj1C2Y1oD/AsaBIcRxpNgyhe6UdAwahQ/7B/yDzObJiHlRsI60r+l1pqpZ
DUVSPe/dDEyTGmOlpiimnBbO2WlaCA==
=xNkS
-----END PGP SIGNATURE-----

--Sig_/TkH89WJytnR288K=Gm+4mTy--