Messages in this thread | | | Date | Fri, 25 Nov 2022 13:58:41 +0100 | From | Jean Delvare <> | Subject | Re: 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
| |