Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 6 Sep 2022 09:50:55 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>
Cc:     David Sterba <dsterba@suse.com>,
        Johannes Thumshirn <johannes.thumshirn@wdc.com>,
        Josef Bacik <josef@toxicpanda.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 btrfs tree with the btrfs-fixes
 tree
Message-ID: <20220906095055.498d90ea@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/+ZW8GY.DYKoImP.5RiOqcl+";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/+ZW8GY.DYKoImP.5RiOqcl+
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/zoned.c

between commit:

  6ca64ac27631 ("btrfs: zoned: fix mounting with conventional zones")

from the btrfs-fixes tree and commit:

  e5182af66852 ("btrfs: convert block group bit field to use bit helpers")

from the btrfs tree.

I fixed it up (the former removed some of the code modified by 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_/+ZW8GY.DYKoImP.5RiOqcl+
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMWi18ACgkQAVBC80lX
0GyPBQf/fLS3R4N6ZMGkwDopaIPWD/0WInzWomaCfw5phpI0LaIG6Ke8aSPo+Sxk
A8B32PFUbzKrRztMdcNjppChwD+tIHHYhOxF7P8BpQKBIGfm0lyJttsVmWZ4fVRi
sAS/Wm+gsWzaM67bQoDxwmE9dGEt1/cKDtS/OONzUil+T/SdftYTrOEN80p35aTg
OAvcJpVgdqKug2y9sIthx0JmGKpgoSb9+h64taSFY3LlaWCeuVHR3suifxRarKbA
9vZ13z9J7n1R+YForP/Ec21u6LKReSN8l++POS+a1hqO5qy3lDAW5KxXFzL1S1MB
SBh9wtEkrel45wpOJCQGZ4KNWmpjiA==
=X7dK
-----END PGP SIGNATURE-----

--Sig_/+ZW8GY.DYKoImP.5RiOqcl+--