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 17:32:28 +0100
From:   Miquel Raynal <miquel.raynal@bootlin.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Richard Weinberger <richard.weinberger@gmail.com>,
        Christian Brauner <brauner@kernel.org>,
        Jan Kara <jack@suse.cz>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Richard Weinberger <richard@nod.at>
Subject: Re: linux-next: manual merge of the mtd tree with the vfs-brauner
 tree
Message-ID: <20231030173228.691620ca@xps-13>
In-Reply-To: <20231030103415.401ce804@canb.auug.org.au>
References: <20231030103415.401ce804@canb.auug.org.au>
Organization: Bootlin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi,

sfr@canb.auug.org.au wrote on Mon, 30 Oct 2023 10:34:15 +1100:

> Hi all,
>=20
> Today's linux-next merge of the mtd tree got a conflict in:
>=20
>   drivers/mtd/devices/block2mtd.c
>=20
> between commit:
>=20
>   1bcded92d938 ("mtd: block2mtd: Convert to bdev_open_by_dev/path()")

I haven't seen this commit, I was not Cc'ed.

> from the vfs-brauner tree and commit:
>=20
>   ff6abbe85634 ("mtd: block2mtd: Add a valid holder to blkdev_put()")

I will drop this commit from mtd/next. Please take it through the
vfs-brauner tree as well to avoid conflicts or otherwise, Richard, can
you send an update at -rc1?

Thanks,
Miqu=C3=A8l