Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Thu, 21 Sep 2023 09:13:52 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Ying Sun <sunying@nj.iscas.ac.cn>
Subject: linux-next: manual merge of the vfs-brauner tree with the mm tree
Message-ID: <20230921091352.01306900@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ab_d6kmKoTJ3hBjotJm9urW";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ab_d6kmKoTJ3hBjotJm9urW
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:

  mm/shmem.c

between commit:

  449e3b71c77c ("mm/shmem: remove dead code can not be satisfied by "(CONFI=
G_SHMEM)&&(!(CONFIG_SHMEM))"")

from the mm tree and commit:

  db58b5eea8a4 ("Revert "tmpfs: add support for multigrain timestamps"")

from the vfs-brauner 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 mm/shmem.c
index be050efe18cb,69595d341882..000000000000
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@@ -4602,7 -4585,11 +4602,7 @@@ static struct file_system_type shmem_fs
  	.parameters	=3D shmem_fs_parameters,
  #endif
  	.kill_sb	=3D kill_litter_super,
- 	.fs_flags	=3D FS_USERNS_MOUNT | FS_ALLOW_IDMAP | FS_MGTIME,
 -#ifdef CONFIG_SHMEM
+ 	.fs_flags	=3D FS_USERNS_MOUNT | FS_ALLOW_IDMAP,
 -#else
 -	.fs_flags	=3D FS_USERNS_MOUNT,
 -#endif
  };
 =20
  void __init shmem_init(void)

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmULfLAACgkQAVBC80lX
0GzAVgf/e2yLK5Nt9UJjjjc5OxUir4/PJzA/bnBIyRyr6rC4hpw3St0kH96Fh2f+
UwaEJwVQbIOe0uX0XWnqPtrKfaUqpyNMWT43PAdU5koU4mUyT2DDpmCEHFLyuJXz
3z0ItYySelpgd6U7jKFRj/uW5SVA1OpS6r/fggTFLFyMIwqwO+gH24voSCPnDw65
IwjHnPl69IvVBWTYq9uqm5xrqX8u5OW+R6oxku22FP3ggvRc5/mevfmZ8zUAtkI2
6Q5fq4CIDT01hlx5DLPj2LxL7Kp4Nz0VcDwO+Y1odIwsv/HlueBp/SrXcZvqVR+w
QUnTlpBT5U+/JT0PD8RCmmStzFxqsw==
=pc46
-----END PGP SIGNATURE-----

--Sig_/ab_d6kmKoTJ3hBjotJm9urW--