lkml.org 
[lkml]   [2022]   [Nov]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the nand tree with the mtd-fixes tree
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

\
 
 \ /
  Last update: 2022-11-25 13:59    [W:0.028 / U:0.956 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site