Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 25 Nov 2022 10:05:04 +0100
From:   Miquel Raynal <miquel.raynal@bootlin.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Boris Brezillon <boris.brezillon@collabora.com>,
        Jean Delvare <jdelvare@suse.de>,
        Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nand tree with the mtd-fixes
 tree
Message-ID: <20221125100504.5424c3ad@xps-13>
In-Reply-To: <20221125094634.665b079c@canb.auug.org.au>
References: <20221125094634.665b079c@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 Jean,

sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100:

> Hi all,
>=20
> Today's linux-next merge of the nand tree got a conflict in:
>=20
>   drivers/mtd/nand/onenand/Kconfig
>=20
> between commit:
>=20
>   c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC")
>=20
> from the mtd-fixes tree and commit:
>=20
>   b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE=
_TEST")

As this commit is not super urgent and because I want to make the merge
process as smooth as possible, I'll drop it from my branches. Please
rebase and resend when -rc1 is out and I'll apply right away.

Thanks Stephen for the report.

Cheers,
Miqu=C3=A8l

>=20
> from the nand tree.
>=20
> 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