From mboxrd@z Thu Jan 1 00:00:00 1970 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 6DE37C433F5 for ; Wed, 23 Mar 2022 23:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346583AbiCWX4F (ORCPT ); Wed, 23 Mar 2022 19:56:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233522AbiCWX4C (ORCPT ); Wed, 23 Mar 2022 19:56:02 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BF933C71D; Wed, 23 Mar 2022 16:54:32 -0700 (PDT) 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 4KP4vl31C4z4xMW; Thu, 24 Mar 2022 10:54:27 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1648079667; bh=UmBSDdH6So88l/7jB3+Q2wl5jNLzkqeCDiZigQ5Z/ko=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=KdnPza9Uk2aZGc3w/GfAqOcsm8L26BZoXBEn+1ctDSBKqKbFmEkCCUJYIJZu0Jkq3 ZDKdXbsb11OPuFc1Q/BUw4sV93GI8+ZM1ooPdWfYOynp6Xyc1AAua4xZ0cYme1jihX xkLQNg8LMkPvkbzphlIttuI/b/jvISezCYG7zqnFEpwJHlmixGtrFHa9Zyj9pkAOwZ YW2lYr99e6M0M2EX3WnKTOsTQvUacW1I3bpp+PdClO+TSs95XN2S8cSJcMk+bxYnIF 9xBfuk9sC3/NbVqAjUJ3Pw7hm/woGpz6PlAzRvnv3RKbjqMs7BJgZquSWeOe01PcI/ uH/kHj+3mTSTw== Date: Thu, 24 Mar 2022 10:54:26 +1100 From: Stephen Rothwell To: David Howells Cc: Matthew Wilcox , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the folio tree with the fscache tree Message-ID: <20220324105426.5250396a@canb.auug.org.au> In-Reply-To: <20220315202816.7ff33386@canb.auug.org.au> References: <20220315202816.7ff33386@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/BvBt17BtIX3fT.BRS9jeX=2"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/BvBt17BtIX3fT.BRS9jeX=2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 15 Mar 2022 20:28:16 +1100 Stephen Rothwell = wrote: > > Today's linux-next merge of the folio tree got a conflict in: >=20 > fs/afs/file.c >=20 > between commit: >=20 > 0c31679cf2c0 ("netfs: Add a netfs inode context") >=20 > from the fscache tree and commits: >=20 > 7d165ab9d0a0 ("afs: Convert from launder_page to launder_folio") > 09f7fc259e5d ("fscache: Convert fscache_set_page_dirty() to fscache_dir= ty_folio()") >=20 > from the folio tree. >=20 > 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 >=20 > diff --cc fs/afs/file.c > index 2b68b2070248,0f9fdb284a20..000000000000 > --- a/fs/afs/file.c > +++ b/fs/afs/file.c > @@@ -19,11 -19,13 +19,11 @@@ > #include "internal.h" > =20 > static int afs_file_mmap(struct file *file, struct vm_area_struct *vma); > -static int afs_readpage(struct file *file, struct page *page); > static int afs_symlink_readpage(struct file *file, struct page *page); > - static void afs_invalidatepage(struct page *page, unsigned int offset, > - unsigned int length); > + static void afs_invalidate_folio(struct folio *folio, size_t offset, > + size_t length); > static int afs_releasepage(struct page *page, gfp_t gfp_flags); > =20 > -static void afs_readahead(struct readahead_control *ractl); > static ssize_t afs_file_read_iter(struct kiocb *iocb, struct iov_iter *= iter); > static void afs_vm_open(struct vm_area_struct *area); > static void afs_vm_close(struct vm_area_struct *area); > @@@ -50,12 -52,12 +50,12 @@@ const struct inode_operations afs_file_ > }; > =20 > const struct address_space_operations afs_file_aops =3D { > - .readpage =3D afs_readpage, > - .readahead =3D afs_readahead, > + .readpage =3D netfs_readpage, > + .readahead =3D netfs_readahead, > - .set_page_dirty =3D afs_set_page_dirty, > - .launder_page =3D afs_launder_page, > + .dirty_folio =3D afs_dirty_folio, > + .launder_folio =3D afs_launder_folio, > .releasepage =3D afs_releasepage, > - .invalidatepage =3D afs_invalidatepage, > + .invalidate_folio =3D afs_invalidate_folio, > .write_begin =3D afs_write_begin, > .write_end =3D afs_write_end, > .writepage =3D afs_writepage, This is now a conflict between the fscache tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/BvBt17BtIX3fT.BRS9jeX=2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmI7szIACgkQAVBC80lX 0GybZQf8DJFHUZdzMw2c2n+Mdcx74RbEJgFiT606pG1l55tGBjWL3+gosNDmUmQp g8JkA/3KjKHYLB5vkbUIuJAvYlDCl52bbluyF7TDcAyWscZ7tr7rCZsmivYAziEP RvEfAyoCPfZ1bRpH5VdjMgQ/kSeiTzGRm5Wa//iThgc4yP7Io5JQeljHcib0IlD6 AmO3Mnj3N8sbFIGlMM6Dbw9J9SivdlKNodGnQnz5PHoq7GVfXGTiDVQ0yAXmONyd XbVx5gWta4VazE/OVFVC6nA/6rutfhi1GD+RyCJhomcH1tQf2cr8hauRnUhuKyop HjZWDXEoFyLMuozSEqOddibj9I3KzQ== =BSkp -----END PGP SIGNATURE----- --Sig_/BvBt17BtIX3fT.BRS9jeX=2--