* linux-next: manual merge of the nand tree with the mtd-fixes tree
@ 2022-11-24 22:46 Stephen Rothwell
2022-11-25 9:05 ` Miquel Raynal
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2022-11-24 22:46 UTC (permalink / raw)
To: Miquel Raynal, Boris Brezillon
Cc: Jean Delvare, Krzysztof Kozlowski, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]
Hi all,
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")
from the nand tree.
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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/mtd/nand/onenand/Kconfig
index c94bf483541e,5c240533cea4..000000000000
--- a/drivers/mtd/nand/onenand/Kconfig
+++ b/drivers/mtd/nand/onenand/Kconfig
@@@ -25,8 -25,7 +25,8 @@@ config MTD_ONENAND_GENERI
config MTD_ONENAND_OMAP2
tristate "OneNAND on OMAP2/OMAP3 support"
depends on ARCH_OMAP2 || ARCH_OMAP3 || (COMPILE_TEST && ARM)
- depends on OF || COMPILE_TEST
+ depends on OF
+ depends on OMAP_GPMC
help
Support for a OneNAND flash device connected to an OMAP2/OMAP3 SoC
via the GPMC memory controller.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the nand tree with the mtd-fixes tree
2022-11-24 22:46 linux-next: manual merge of the nand tree with the mtd-fixes tree Stephen Rothwell
@ 2022-11-25 9:05 ` Miquel Raynal
2022-11-25 12:58 ` Jean Delvare
0 siblings, 1 reply; 3+ messages in thread
From: Miquel Raynal @ 2022-11-25 9:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Boris Brezillon, Jean Delvare, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
Hi Jean,
sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100:
> Hi all,
>
> 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.
Thanks Stephen for the report.
Cheers,
Miquèl
>
> from the nand tree.
>
> 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.
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the nand tree with the mtd-fixes tree
2022-11-25 9:05 ` Miquel Raynal
@ 2022-11-25 12:58 ` Jean Delvare
0 siblings, 0 replies; 3+ messages in thread
From: Jean Delvare @ 2022-11-25 12:58 UTC (permalink / raw)
To: Miquel Raynal
Cc: Stephen Rothwell, Boris Brezillon, Krzysztof Kozlowski,
Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-25 12:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-24 22:46 linux-next: manual merge of the nand tree with the mtd-fixes tree Stephen Rothwell
2022-11-25 9:05 ` Miquel Raynal
2022-11-25 12:58 ` Jean Delvare
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.