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:   Tue, 3 May 2022 16:14:44 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>,
        Matthew Wilcox <willy@infradead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        NeilBrown <neilb@suse.de>
Subject: linux-next: manual merge of the mm tree with the folio tree
Message-ID: <20220503161444.11003568@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/1gPwzsRHU=3JxRPXg2Xm+=i";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/1gPwzsRHU=3JxRPXg2Xm+=i
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  fs/nfs/file.c

between commit:

  9ac3e82e9ae2 ("nfs: Convert to release_folio")

from the folio tree and commit:

  e1736b007c43 ("VFS: Add FMODE_CAN_ODIRECT file flag")

from the mm 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 fs/nfs/file.c
index d764b3ce7905,bfb4b707b07e..000000000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -522,8 -537,7 +534,7 @@@ const struct address_space_operations n
  	.write_begin =3D nfs_write_begin,
  	.write_end =3D nfs_write_end,
  	.invalidate_folio =3D nfs_invalidate_folio,
 -	.releasepage =3D nfs_release_page,
 +	.release_folio =3D nfs_release_folio,
- 	.direct_IO =3D nfs_direct_IO,
  #ifdef CONFIG_MIGRATION
  	.migratepage =3D nfs_migrate_page,
  #endif

--Sig_/1gPwzsRHU=3JxRPXg2Xm+=i
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJwyFQACgkQAVBC80lX
0Gy23Qf+K2XunRfxW+J5XLeo0E7gvn1LHFWgspLBWoPRNof4X8Q5BECLqQgCLkQK
Jv/58QjSXPLmCliy5VAqao0mRhg1rWyzb7GIiSUZhvHjhaivpXjaFzWp4Rwz07VT
NrFkudt+fxt/8WF0LkgfTFkS8xLJE1jAva3zDYHrZJBD/BltHKCpCyPVG9QAozb3
vKrJ+4XnoluY3O2rLp6WjC2Ma7l0e8Ra0qXlvV5lWZVbhZepyNjeBQKoq1Va2JX6
zsXH8eV0c7QM5twiC3CMV5jJV4Vl3HWqjlpjkTywyfiFQol1iBhBrpG2BhWSDxuM
TMO5SSHzzySnkwVF58Y1dTmNr4GIMg==
=FOhL
-----END PGP SIGNATURE-----

--Sig_/1gPwzsRHU=3JxRPXg2Xm+=i--