Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Date:   Tue, 10 Oct 2023 10:50:21 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Miklos Szeredi <miklos@szeredi.hu>,
        Amir Goldstein <amir73il@gmail.com>
Cc:     Alexander Larsson <alexl@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Wedson Almeida Filho <walmeida@microsoft.com>
Subject: linux-next: manual merge of the vfs-brauner tree with the overlayfs
 tree
Message-ID: <20231010105021.57fa4379@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ZKIpQ573POdotYh0BhHD3UK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/overlayfs/super.c

between commit:

  1e97d6e67406 ("ovl: Move xattr support to new xattrs.c file")

from the overlayfs tree and commit:

  3f644c1cd7b5 ("overlayfs: move xattr tables to .rodata")

from the vfs-brauner tree.

I fixed it up (I used the former version of this file and applied the
following merge fix 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 10 Oct 2023 10:47:16 +1100
Subject: [PATCH] fix up for "ovl: Move xattr support to new xattrs.c file"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/overlayfs/xattrs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c
index 1b16b0abdf91..8a9c76adbf5c 100644
--- a/fs/overlayfs/xattrs.c
+++ b/fs/overlayfs/xattrs.c
@@ -251,13 +251,13 @@ static const struct xattr_handler ovl_other_xattr_han=
dler =3D {
 	.set =3D ovl_other_xattr_set,
 };
=20
-static const struct xattr_handler *ovl_trusted_xattr_handlers[] =3D {
+static const struct xattr_handler * const ovl_trusted_xattr_handlers[] =3D=
 {
 	&ovl_own_trusted_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
 };
=20
-static const struct xattr_handler *ovl_user_xattr_handlers[] =3D {
+static const struct xattr_handler * const ovl_user_xattr_handlers[] =3D {
 	&ovl_own_user_xattr_handler,
 	&ovl_other_xattr_handler,
 	NULL
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUkkb0ACgkQAVBC80lX
0GzaWgf/cC2TeY5OJwDdyGfsM7vDQfmIA7qSksnT7pm2cCw++vrT9j1guCo2is9D
EOrfFlh54szOgU7R/L3r5EZiIuHbI4xao4dOZ4qvwi0wOjcZWYkrOLlgKxoWJjXm
oJghbxa8KUKpExlBizXO+85bJzsmKm2AycHpT2KEAZiRVxmKTDFFSKxYte9mHqWw
jLc1JlmMpHBkXehx1tKehqNIggQ31Jcjcwtv6NvL4hiFcjKtDg679pM6LMaaTJCj
fysUEioo4E3Ek9sgNfdj3omQpru410OCu+t8S5P67NvAsElsCO1joV1Vj59vSyQF
YpX84VWKhDZJS83hTr4eMjhEgESuAw==
=Q+Y+
-----END PGP SIGNATURE-----

--Sig_/ZKIpQ573POdotYh0BhHD3UK--