linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro.org>,
	Krzysztof Kozlowski <krzk@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the mmc tree with the samsung-krzk tree
Date: Tue, 8 Sep 2020 14:46:22 +1000	[thread overview]
Message-ID: <20200908144622.09385c88@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1450 bytes --]

Hi all,

Today's linux-next merge of the mmc tree got a conflict in:

  drivers/mmc/host/Kconfig

between commits:

  cb6c03019cdd ("ARM: exynos: stop selecting PLAT_SAMSUNG")
  db8230d29c3a ("ARM: s5pv210: don't imply CONFIG_PLAT_SAMSUNG")

from the samsung-krzk tree and commit:

  54d8454436a2 ("mmc: host: Enable compile testing of multiple drivers")

from the mmc 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/mmc/host/Kconfig
index 0d7c61d8d1d9,dc646359b4ff..000000000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -289,7 -301,8 +301,8 @@@ config MMC_SDHCI_TEGR
  
  config MMC_SDHCI_S3C
  	tristate "SDHCI support on Samsung S3C SoC"
- 	depends on MMC_SDHCI && (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS)
+ 	depends on MMC_SDHCI
 -	depends on PLAT_SAMSUNG || COMPILE_TEST
++	depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
  	help
  	  This selects the Secure Digital Host Controller Interface (SDHCI)
  	  often referrered to as the HSMMC block in some of the Samsung S3C

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2020-09-08  4:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  4:46 Stephen Rothwell [this message]
2020-09-08  6:20 ` linux-next: manual merge of the mmc tree with the samsung-krzk tree Krzysztof Kozlowski
2020-10-13  7:20 ` Stephen Rothwell

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=20200908144622.09385c88@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=arnd@arndb.de \
    --cc=krzk@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ulf.hansson@linaro.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).