Received-SPF: pass (google.com: domain of linux-kernel+bounces-156054-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: Wed, 24 Apr 2024 10:24:45 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Gao Xiang <xiang@kernel.org>
Cc: Baokun Li <libaokun1@huawei.com>, Gao Xiang
 <hsiangkao@linux.alibaba.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
 erofs-fixes tree
Message-ID: <20240424102445.53ba5ba2@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/N1u+FRH.WI+P0e8==UOgtKr";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/N1u+FRH.WI+P0e8==UOgtKr
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/erofs/super.c

between commits:

  ab1bbc1735ff ("erofs: get rid of erofs_fs_context")
  569a48fed355 ("erofs: reliably distinguish block based and fscache mode")

from the erofs-fixes tree and commit:

  e4f586a41748 ("erofs: reliably distinguish block based and fscache mode")

from the vfs-brauner tree.

I fixed it up (I think - I used the former version) 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_/N1u+FRH.WI+P0e8==UOgtKr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYoUU0ACgkQAVBC80lX
0Gzy0gf+JDT9ihmacsMjGGeyfSgZi59ayg2Rg0fouFtDJn/R2sDE3xyxpmPbtG/C
lqT8KXq3s/IIc6zvacaHL2YH28ro1tL4IiRuIxYdC7OUxzz4eCaqjNYINjng88up
4puCAFYjICOOKXJCIxg4CbaL9C27NA8XVCXuX5mECmXiD1kBUvEMEnajui7cXj1v
Mp+1ST90Qn1d4tSWfFPzdCYuk8F7AuwdJkOH3UnwUn1MlXkjGZ/rkV98bTfKqeUS
LBqdLz8865MAt7jo+eU3ajLDFl9YetkKwdfdEgNe4himfeO4VIsFxZSv1Zez7tHq
fSKA25qcu+tK/AEXcKRsHB3xmunxFQ==
=WZfC
-----END PGP SIGNATURE-----

--Sig_/N1u+FRH.WI+P0e8==UOgtKr--