Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Fri, 15 Sep 2023 09:14:21 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     David Sterba <dsterba@suse.cz>,
        Andrew Morton <akpm@linux-foundation.org>
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>,
        Qi Zheng <zhengqi.arch@bytedance.com>
Subject: linux-next: manual merge of the btrfs tree with the mm tree
Message-ID: <20230915091421.58207f2c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/83k3IEdMgwIc5sj0Ruae6qf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/83k3IEdMgwIc5sj0Ruae6qf
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/super.c

between commit:

  c0824542e4d1 ("fs: super: dynamically allocate the s_shrink")

from the mm tree and commit:

  2ebed4689ba2 ("btrfs: open block devices after superblock creation")

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

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUDk80ACgkQAVBC80lX
0Gy9+Qf6AnhpYAVgoa9Xy3LB3GWZF8xDTg/XQj/KcleHTMraHHNYLadSbK21iNsr
AGPM1IZWdNo0lSTYuird4+FufGCBEIct7ZRDr/SgEFNdqL1Q1IxiKRVsohQYwOuF
dHZbVxQOxDxi6U/FNzcH7TEGAS4KeDmbAqgcOar9lPC/UwLHB98jfE5UTuBam0XT
bDdovioXCMfWiZW9QPdJtfxe5n/BC/8FfUVKWrRaGOk4VXDiJN6NIggvX4bmo7q+
Lo0XvhUqUOIhy7rONhIDsEsAVfiC0/p/DS/FH+hQJ/nqSSmxron8UW2trWVd+hHh
yB04V5cbwI6Q9B2yrh7R6RA59WCVSA==
=DEi9
-----END PGP SIGNATURE-----

--Sig_/83k3IEdMgwIc5sj0Ruae6qf--