linux-kernel - linux-next: manual merge of the mmc tree with the samsung-krzk tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20200908144622.09385c88@canb.auug.org.au>
Date:   Tue, 8 Sep 2020 14:46:22 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Ulf Hansson <ulf.hansson@...aro.org>,
        Krzysztof Kozlowski <krzk@...nel.org>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: linux-next: manual merge of the mmc tree with the samsung-krzk tree

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

Content of type "application/pgp-signature" skipped