Received-SPF: pass (google.com: domain of linux-kernel+bounces-205132-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Fri, 7 Jun 2024 08:55:25 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Qu Wenruo <wqu@suse.com>
Subject: linux-next: manual merge of the btrfs tree with the btrfs-fixes
 tree
Message-ID: <20240607085525.30555161@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/lZUFP91txiP9OdWiRNXURh4";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  fs/btrfs/extent_io.c

between commit:

  d202776a44d5 ("btrfs: protect folio::private when attaching extent buffer=
 folios")

from the btrfs-fixes tree and commit:

  46cda5a0ef68 ("btrfs: fix a possible race window when allocating new exte=
nt buffers")

from the btrfs tree.

I fixed it up (I just used the latter) 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

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZiPl0ACgkQAVBC80lX
0GxNPQgAoNTk6dQst0MpO3VMiePPGjAGR1vgVpldTNMxZQzyyUjXynfqXbBFU2lp
usJaXcGyGN/EvqJKbQysNzXOoe+NOhyRI2V1QOqYtOhQ+i+iE6A09n+BXd5BOmr1
Moz2xcLlyYdrPMFsPch7CrO3FDhQL11izkbwtmDVND3Pt0xvM1uDbCSAUyFvAgeN
+QG29cG0/wPKeHgcaVHjyKNI3Tjkn/WEptHWbxQMR0swuA7zhfKtAYR4mlX0RZ22
B8IW6L1a2n0xh55uPihx/ejqMa/qpaq6F9lU+iBYxDildv00n+gplDrIdP8r3DeH
8jRpBeBVrvYdZ2kPNFogBhSCHpHAIA==
=acE0
-----END PGP SIGNATURE-----

--Sig_/lZUFP91txiP9OdWiRNXURh4--