From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Boris Brezillon <boris.brezillon@collabora.com>
Cc: 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: linux-next: manual merge of the nand tree with the mtd-fixes tree
Date: Fri, 25 Nov 2022 09:46:34 +1100 [thread overview]
Message-ID: <20221125094634.665b079c@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2022-11-24 22:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 22:46 Stephen Rothwell [this message]
2022-11-25 9:05 ` linux-next: manual merge of the nand tree with the mtd-fixes tree Miquel Raynal
2022-11-25 12:58 ` Jean Delvare
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221125094634.665b079c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=boris.brezillon@collabora.com \
--cc=jdelvare@suse.de \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.