Received-SPF: pass (google.com: domain of linux-kernel+bounces-22871-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 11 Jan 2024 10:03:37 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: Christian Brauner <brauner@kernel.org>, David Sterba <dsterba@suse.com>,
 Linus Torvalds <torvalds@linux-foundation.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, "Matthew Wilcox (Oracle)"
 <willy@infradead.org>, Qu Wenruo <wqu@suse.com>
Subject: linux-next: manual merge of the btrfs tree with Linus' tree
Message-ID: <20240111100337.3e9ef25c@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lLfBhIqmLWmkcJpHWEd/qNC";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

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

  fs/btrfs/extent_io.c

between commits:

  affc5af36bbb ("Merge tag 'for-6.8-tag' of git://git.kernel.org/pub/scm/li=
nux/kernel/git/kdave/linux")
  600f111ef51d ("fs: Rename mapping private members")

from Linus' tree and commit:

  08236d11031b ("btrfs: cache folio size and shift in extent_buffer")

from the btrfs 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/btrfs/extent_io.c
index cfd2967f04a2,c8aabe3be169..000000000000
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@@ -3677,7 -3668,9 +3668,9 @@@ reallocate
  		 * and free the allocated page.
  		 */
  		folio =3D eb->folios[i];
+ 		eb->folio_size =3D folio_size(folio);
+ 		eb->folio_shift =3D folio_shift(folio);
 -		spin_lock(&mapping->private_lock);
 +		spin_lock(&mapping->i_private_lock);
  		/* Should not fail, as we have preallocated the memory */
  		ret =3D attach_extent_buffer_folio(eb, folio, prealloc);
  		ASSERT(!ret);

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWfIkkACgkQAVBC80lX
0GypFwgAl5YNYuk4e0ljNREu1f9sb1MwxPNZYf9yeVDZYb2AqRu4ccHcSj5g5/Lz
FFb32Sx9dr7p80CTTMpt/Vx+RJie2B0QnXKi6MxSOHUOvxHix28j1PfJMYGCMRFE
7FLxaDbSU4Zwkyuergma2qy9fiWUitpxLXnbl19uPOqAzVJSOYeTq8DsfK5upS9E
TKbR63+wOpaqExPWICu6dGvvmbUFizi438ckdnQuczqsLVwEqEz8/PYKEgj8XTZR
5EskRvoiuTkwmeHXU+/w7t89BA10GSLFwmDTgbb++KqFf4Hnts3sRM5/gYiRRNTB
sf2qqDeqimxeC2N78sRHYb8XdYEOzw==
=ycui
-----END PGP SIGNATURE-----

--Sig_/lLfBhIqmLWmkcJpHWEd/qNC--