From nobody Thu Sep 11 20:31:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75C00C636D4 for ; Thu, 16 Feb 2023 03:05:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229688AbjBPDFZ (ORCPT ); Wed, 15 Feb 2023 22:05:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229505AbjBPDFX (ORCPT ); Wed, 15 Feb 2023 22:05:23 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C90082006F; Wed, 15 Feb 2023 19:05:21 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4PHKZ35GHgz4x7s; Thu, 16 Feb 2023 14:05:15 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1676516716; bh=3FPnf+07xD0ONPxXpK97iOyQGqkBz83fZ1Nfp+k0cnU=; h=Date:From:To:Cc:Subject:From; b=NZtKpkQ1uBbI4sOG/Ay6CQTP20fBMqtsb5scM1i2xn3OM+68ma9u0a4DxNmbChIbI pYS4JDNFBVAgNKYCvxzWCq/b9DbBaKtysiEEG1RP7dmBMqB3kx1q82v6e1m8pBiDKR LYnRUBRYlHMJGH/YMYT1da7c/Y+pyvtxkn++q25QrL7Bhyfnl78dQ2U1AmZmpgZmzj GRyu1RAmZy67QJCDA1xvek3tLYHb5Eld9RCMc/t2+VGVtbvbxshAoWtkMj9C+a0SKg GHGjK4MVlLeh+5uM/X3Hiv0NrTknZjfNXiKDNXJVKOeds1qhENBJq8X+0R8v60mtT4 VG8nROC4GJtaw== Date: Thu, 16 Feb 2023 14:05:14 +1100 From: Stephen Rothwell To: Andrew Morton , Anna Schumaker , Trond Myklebust Cc: NFS Mailing List , Anna Schumaker , Linux Kernel Mailing List , Linux Next Mailing List , "Matthew Wilcox (Oracle)" , Trond Myklebust Subject: linux-next: manual merge of the mm-stable tree with the nfs-anna tree Message-ID: <20230216140514.631bcca1@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/qdgU71WLDhPmzVBHko2q0C_"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/qdgU71WLDhPmzVBHko2q0C_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the mm-stable tree got a conflict in: fs/nfs/write.c between commit: 0c493b5cf16e ("NFS: Convert buffered writes to use folios") from the nfs-anna tree and commit: d585bdbeb79a ("fs: convert writepage_t callback to pass a folio") from the mm-stable 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/write.c index b508c985eb14,9d6432cb3f44..f4cca8f00c0c --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@@ -688,15 -689,14 +688,14 @@@ int nfs_writepage(struct page *page, st return ret; } =20 - static int nfs_writepages_callback(struct page *page, + static int nfs_writepages_callback(struct folio *folio, - struct writeback_control *wbc, void *data) + struct writeback_control *wbc, void *data) { - struct folio *folio =3D page_folio(page); int ret; =20 - ret =3D nfs_do_writepage(&folio->page, wbc, data); + ret =3D nfs_do_writepage(folio, wbc, data); if (ret !=3D AOP_WRITEPAGE_ACTIVATE) - unlock_page(page); + folio_unlock(folio); return ret; } =20 --Sig_/qdgU71WLDhPmzVBHko2q0C_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmPtnWoACgkQAVBC80lX 0GwLcQf/aGPPu+a5LaK31tdtkX85mxVDeAPhP1rR2RRnAAuhX8M/OgMwfX/TfQ6e 6hgbBrPPHAJoZNLynciotlVCxSHEdc50IglBDG5u5oH2QB8CvktdgH0XB7j7lk6D rGwfOO73mbbeobuVLS7CZqbSMd9jKK7zAq7Kyb4p56zk9Sza7LIEvaMZYrX+JFVb fcb5rU8B3+lncGMiOZVZHUx2zSQlRoZixYwAHiwpIGtODeKKzZzl4tea2hy3cXn0 dRYS/Zc55KDIvoxD+BmYbjhLY8nqUrOjHsSSLOm58au/ZWOMGANzEZ7RvcHvIHgB GQf6B/r9n86Fkbn630bRTcbs6yEISQ== =xkMY -----END PGP SIGNATURE----- --Sig_/qdgU71WLDhPmzVBHko2q0C_--