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 13:58:41 +0100
From:   Jean Delvare <jdelvare@suse.de>
To:     Miquel Raynal <miquel.raynal@bootlin.com>
Cc:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Boris Brezillon <boris.brezillon@collabora.com>,
        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: <20221125135841.134310ba@endymion.delvare>
In-Reply-To: <20221125100504.5424c3ad@xps-13>
References: <20221125094634.665b079c@canb.auug.org.au>
        <20221125100504.5424c3ad@xps-13>
Organization: SUSE Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Fri, 25 Nov 2022 10:05:04 +0100, Miquel Raynal wrote:
> sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100:
> > Today's linux-next merge of the nand tree got a conflict in:
> > 
> >   drivers/mtd/nand/onenand/Kconfig
> > 
> > between commit:
> > 
> >   c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC")
> > 
> > from the mtd-fixes tree and commit:
> > 
> >   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.

Noted, no problem.

-- 
Jean Delvare
SUSE L3 Support