Received-SPF: pass (google.com: domain of linux-kernel+bounces-7682-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 21 Dec 2023 11:18:47 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>, David Howells
 <dhowells@redhat.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the vfs-brauner tree
Message-ID: <20231221111847.689ea41f@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jVYJpyN+lRwKsnc3tK+eeuL";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/jVYJpyN+lRwKsnc3tK+eeuL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

After merging the vfs-brauner tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/netfs/buffered_write.c: In function 'netfs_kill_pages':
fs/netfs/buffered_write.c:569:17: error: implicit declaration of function '=
generic_error_remove_page'; did you mean 'generic_error_remove_folio'? [-We=
rror=3Dimplicit-function-declaration]
  569 |                 generic_error_remove_page(mapping, folio_page(folio=
, 0));
      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~
      |                 generic_error_remove_folio

Caused by commit

  dec5b4af52dc ("netfs: Provide a writepages implementation")

interacting with commit

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

I have applied the following merge resolution patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 21 Dec 2023 11:08:57 +1100
Subject: [PATCH] fixup for "netfs: Provide a writepages implementation"

interacting with

  af7628d6ec19 ("fs: convert error_remove_page to error_remove_folio")

from the mm-stable tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/netfs/buffered_write.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c
index a739805dd394..d7ce424b9188 100644
--- a/fs/netfs/buffered_write.c
+++ b/fs/netfs/buffered_write.c
@@ -566,7 +566,7 @@ static void netfs_kill_pages(struct address_space *mapp=
ing,
 			folio_end_fscache(folio);
 		folio_end_writeback(folio);
 		folio_lock(folio);
-		generic_error_remove_page(mapping, folio_page(folio, 0));
+		generic_error_remove_folio(mapping, folio);
 		folio_unlock(folio);
 		folio_put(folio);
=20
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/jVYJpyN+lRwKsnc3tK+eeuL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWDhGcACgkQAVBC80lX
0GxPWAf6A9EwsCkOWlmoR8H2Sb7nY5ZXdZRhChMDx+tmIq7xB4MF1IqFYI3If9O2
RHyaLr/UT9DQXSxfOlhpLQXtp1VOeb2r41j1z2mkfxCuuy4HQM+8IOUJHand+2LE
Luq4FC3neTHAFZyBJlOD59AbyPlYh2+gVeuSrA7nFIcGaXAzbAw+jQf+Qxfddwy7
Rv1SPd0XddSdmvtPkmkID9xruW2HIbH20oCvm2gyWxKdZ9tPUqnG03ys5Z8eDLu1
jJ3nXbs8zGE4ZQ0YukVSk3878DgQH91FdEYG4RPHravVFpU80AnYbb1Yw7efnAGn
afzunftJvhj0nmDHztwoiVxu++grdQ==
=ao8G
-----END PGP SIGNATURE-----

--Sig_/jVYJpyN+lRwKsnc3tK+eeuL--