Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Date:   Mon, 2 May 2022 17:43:33 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Matthew Wilcox <willy@infradead.org>,
        David Sterba <dsterba@suse.cz>
Cc:     Christoph Hellwig <hch@lst.de>, David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the folio tree with the btrfs tree
Message-ID: <20220502174305.1cbf7b40@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/jn1Ms63ppBkLEKtFyZNOA4W";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/btrfs/ctree.h
  fs/btrfs/inode.c

between commit:

  a3e4d924b41d ("btrfs: move btrfs_readpage to extent_io.c")

from the btrfs tree and commit:

  5a912a9c68ac ("btrfs: Convert btrfs to read_folio")

from the folio tree.

I fixed it up (I used the conflicting parts of the above files from the
former and applied the below patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 May 2022 17:21:26 +1000
Subject: [PATCH] fix up for "btrfs: move btrfs_readpage to extent_io.c"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/btrfs/extent_io.c | 3 ++-
 fs/btrfs/extent_io.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5de09556b1c3..aa8905a0d63a 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3792,8 +3792,9 @@ static int btrfs_do_readpage(struct page *page, struc=
t extent_map **em_cached,
 	return ret;
 }
=20
-int btrfs_readpage(struct file *file, struct page *page)
+int btrfs_read_folio(struct file *file, struct folio *folio)
 {
+	struct page *page =3D &folio->page;
 	struct btrfs_inode *inode =3D BTRFS_I(page->mapping->host);
 	u64 start =3D page_offset(page);
 	u64 end =3D start + PAGE_SIZE - 1;
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 375a721c48eb..4a2205fd189a 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -166,7 +166,7 @@ typedef struct extent_map *(get_extent_t)(struct btrfs_=
inode *inode,
 int try_release_extent_mapping(struct page *page, gfp_t mask);
 int try_release_extent_buffer(struct page *page);
=20
-int btrfs_readpage(struct file *file, struct page *page);
+int btrfs_read_folio(struct file *file, struct folio *folio);
 int extent_write_full_page(struct page *page, struct writeback_control *wb=
c);
 int extent_write_locked_range(struct inode *inode, u64 start, u64 end);
 int extent_writepages(struct address_space *mapping,
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/jn1Ms63ppBkLEKtFyZNOA4W
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmJvi6YACgkQAVBC80lX
0GzL2Qf+JmpUJDiYOmb7QWDIaPWWF1+L0XINehDtxVS6WKRPzQn/v6Y3fCLedqxz
yAhRgMPY2fcI0I3oCnTLET6rIKgXF+bn6xA4hMHDjSerWKN0qYtFv2QpYs0oIymU
mkolecA410LZENlpe9KjlQ0yUaCKnQoey/qAyL3SWOFaQGoLcGSl92Q+2GCx7LR1
/bfmtLcViVDhEi2g245x8PkTz++krGdSTi51hMK03HzbXep8h9s4Qv5uspJSxoYd
gheEx+KTBbUjCUEqi7qT7jWrJdeXfgA+DflYtmrTAnI3rzSy+Ix2wkA90iM/FF+7
b7YYTjq5Ol9ZbB+hOxgKcXKx0lCVhg==
=HzLx
-----END PGP SIGNATURE-----

--Sig_/jn1Ms63ppBkLEKtFyZNOA4W--