Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 21 Nov 2022 14:20:14 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Paul Moore <paul@paul-moore.com>
Cc:     Gaosheng Cui <cuigaosheng1@huawei.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 security tree with Linus' tree
Message-ID: <20221121142014.0ae7c8ff@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2QCuX=a+BnI3/e5VWm+HwLb";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/2QCuX=a+BnI3/e5VWm+HwLb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  security/commoncap.c

between commit:

  8cf0a1bc1287 ("capabilities: fix potential memleak on error path from vfs=
_getxattr_alloc()")

from Linus' tree and commit:

  f6fbd8cbf3ed ("lsm,fs: fix vfs_getxattr_alloc() return type and caller er=
ror paths")

from the security tree.

I fixed it up (I just used the latter) 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

--Sig_/2QCuX=a+BnI3/e5VWm+HwLb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN67m8ACgkQAVBC80lX
0Gyhawf/U5EJj+aylv5HycPOhAsEkOSpqqT+bNZWLLKp0mmpeOYseEorogQYxseV
/Zj0DNKu9EYXWPXicoRRsTomxzKoH5sbGBLfWggLd8sJNQsFethQPzuZWzC/bANq
VGMNHKRKwo47LvBoMdyVg/0SsLmJeaWl0Bh5gd9guAYEe22fkO7xYfR5gRBB3CAJ
61sILPDicluX4ewGXSzLANAhTRHu+Af/LzP4WG1Ao+62JVB14jIQpvj/+8ih2i+k
ivnKDJbvyr6RmUluLJ89NCHe29TryIdeXWlNwzyKn3NN+mTvrWl/OTdXC6EhUoxV
KIOc3jx6zYF1EhS/Mc/0tHcCnEEnlw==
=fCSw
-----END PGP SIGNATURE-----

--Sig_/2QCuX=a+BnI3/e5VWm+HwLb--