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 09:46:34 +1100
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
Message-ID: <20221125094634.665b079c@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/z1rHAK78n=lgjS..EJ06kCf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/z1rHAK78n=lgjS..EJ06kCf
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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_T=
EST")

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.

--=20
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.

--Sig_/z1rHAK78n=lgjS..EJ06kCf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmN/9EoACgkQAVBC80lX
0GwTwgf8D2FXPFrLgdJAjh9a/6Ei2diysleqo4EJ6DELMQkV6CIR7ekaCh3VcG8K
zfvZGuQGi9Xi7+C93lJ+SdDqI8Be0ttrPl+7FGMuzF/Yxa1foCDPYQG3DxEDlT8n
GDL3M7oOCrNGIRnpvWrDtbflM9r0fffoYC4PXqcRW36GrC8FS1q7MWc89ebLgwJY
r55Qapm+z52YHQ6k3c58bp0bDEY0Fxa3JMHUDm/LHg/GxbuErJB+jU3O7WaPd2Et
v/kEBFKXJTWrKAH3wZMoRkTeCVTb0oPqJ22u/wA8HJGjHbevNxkU3OoqnLv6ybRU
H6Ee9jlRCDP8YroqJ5VrB0A2EIORvQ==
=FFOT
-----END PGP SIGNATURE-----

--Sig_/z1rHAK78n=lgjS..EJ06kCf--