Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
Date:   Tue, 15 Mar 2022 20:52:59 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Matthew Wilcox <willy@infradead.org>,
        Richard Weinberger <richard@nod.at>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Zhihao Cheng <chengzhihao1@huawei.com>
Subject: linux-next: manual merge of the folio tree with the ubifs-fixes
 tree
Message-ID: <20220315205259.71b4238a@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/.wP75LYaKDQTnOQ7mCg.KJi";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/ubifs/file.c

between commit:

  3b67db8a6ca8 ("ubifs: Fix to add refcount once page is set private")

from the ubifs-fixes tree and commit:

  c337f2f4f746 ("ubifs: Convert from invalidatepage to invalidate_folio")

from the folio tree.

I fixed it up (I hope - 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/ubifs/file.c
index 6b45a037a047,8a9ffc2d4167..000000000000
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@@ -1304,8 -1304,8 +1304,8 @@@ static void ubifs_invalidate_folio(stru
  		release_existing_page_budget(c);
 =20
  	atomic_long_dec(&c->dirty_pg_cnt);
- 	detach_page_private(page);
- 	ClearPageChecked(page);
 -	folio_clear_private(folio);
++	folio_detach_private(folio);
+ 	folio_clear_checked(folio);
  }
 =20
  int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)

--Sig_/.wP75LYaKDQTnOQ7mCg.KJi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmIwYfsACgkQAVBC80lX
0Gwq/wf/WHT8NhSMG7gMJw8I4Js39P21jI4SVNqZjOErX1hAIk8h3OZlt4j3wJNw
GamvJU3tNCVkDSYNBSCOBoRDipPbBX0Wy7fCNuKHmvO5iORrAFEzd3Yfes5cJuPS
iKkoTG4cViwaNxy9Izs8OX8IIabMCjb+xgqyzDAJYfmiU02ilsQ7pK+fcfAJTFTT
GB1L1JtKIw0pf0O12Yzngqfe9gc9itOMmHIEOJdgZhmGyg/I0QHu3zMm+1vbsWHD
Phpek9H3jn4/8cakWp4lnRzGNFNrGiokY/u5ZOuQ2nwd2e6nRwIPeG03EFqYbPJj
CYY8Pm56jSdljASAxfG60VffxprY0A==
=1t4B
-----END PGP SIGNATURE-----

--Sig_/.wP75LYaKDQTnOQ7mCg.KJi--