Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Date:   Mon, 27 Nov 2023 09:20:01 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Christian Brauner <brauner@kernel.org>,
        David Sterba <dsterba@suse.cz>
Cc:     David Sterba <dsterba@suse.com>, Jan Kara <jack@suse.cz>,
        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 vfs-brauner tree with the btrfs
 tree
Message-ID: <20231127092001.54a021e8@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/I3Xqh2DgEW3w5Xn2q6qm7Hj";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  fs/btrfs/super.c

between commit:

  2f2cfead5107 ("btrfs: remove old mount API code")

from the btrfs tree and commit:

  ead622674df5 ("btrfs: Do not restrict writes to btrfs devices")

from the vfs-brauner tree.

I fixed it up (the former removed the funtion updated by the latter, but
a further fix may be required to implement the intent of 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_/I3Xqh2DgEW3w5Xn2q6qm7Hj
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVjxJEACgkQAVBC80lX
0GwjAQf8DoiwWi9+TfHakb0vP8exndf9aBFUoUC3oLyzPrFFAlo6fimG85Ivzi9x
oNeV3F59RY5gvEgldQnwLzSeljJ08yw+4S6+qx6PoroM5jyi5VwYQ8aY6gmD5fEN
QlDOMim+4VW2+kyDoPQzfDXfRMF6JFdO5XVV7QZ9U6NMbduOq5jpu1UCZZWksxcw
7dKXMD6tPL/eV5lHPZ3C74U0jjJJWcqr7YfZhh1/Pwv4gjhze4XlUTpCJ4u7/1zg
SKHLiFW6jERI8FWPiU1LdkyfyKg2P08yJ7J5pVjWAkGjVtAfR5uR54iWvZNc7yZi
lyYCz0iW1Mxxamtioy1kan0GQeiQxw==
=CivK
-----END PGP SIGNATURE-----

--Sig_/I3Xqh2DgEW3w5Xn2q6qm7Hj--