Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
Date:   Mon, 30 Oct 2023 10:34:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Richard Weinberger <richard.weinberger@gmail.com>,
        Christian Brauner <brauner@kernel.org>
Cc:     Jan Kara <jack@suse.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        Richard Weinberger <richard@nod.at>
Subject: linux-next: manual merge of the mtd tree with the vfs-brauner tree
Message-ID: <20231030103415.401ce804@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/B/Rg_CReG_X5M_uLRXDFwHV";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  drivers/mtd/devices/block2mtd.c

between commit:

  1bcded92d938 ("mtd: block2mtd: Convert to bdev_open_by_dev/path()")

from the vfs-brauner tree and commit:

  ff6abbe85634 ("mtd: block2mtd: Add a valid holder to blkdev_put()")

from the mtd tree.

I fixed it up (I just used the former) 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_/B/Rg_CReG_X5M_uLRXDFwHV
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmU+6/cACgkQAVBC80lX
0GzPigf9FYse3zoIbgrtnceRLefZqLVZHHG9fNue3KDIkrzXCtlmC9TOGvBNsArb
zw0tQmOGK4hdpSo7wbMH++tv5l2LypquzVxnrFE61fNLREhnm0VoMw5Z8WHQ7Kna
JbkR/ffrPDz7iPt76nebIRkxMpih6QC3qD4Oj2Zd7Z0lNqOiOUjMd1Kmtpf+b09F
5Rb+AxtDxUetMplLP1nqUPWszJqBTteJIUHx1Z7ke7FsXM1sCFw7Iq/GBnGljyN8
cKqcAtEYmz/1vPmKBWAq7ltL1Vua0jHXSPfQZx67j19ftQzAlrmtZX4dmeL9vo7H
9ZDEULocsWiupIWOY6IcDczs1wWDPQ==
=sXr2
-----END PGP SIGNATURE-----

--Sig_/B/Rg_CReG_X5M_uLRXDFwHV--