linux-kernel - linux-next: manual merge of the clk tree with the mmc 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>] [day] [month] [year] [list]

Message-ID: <20140604171028.4ea86dc4@canb.auug.org.au>
Date:	Wed, 4 Jun 2014 17:10:28 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mike Turquette <mturquette@...aro.org>,
	Chris Ball <chris@...ntf.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roger Tseng <rogerable@...ltek.com>,
	David Lanzendörfer 
	<david.lanzendoerfer@....ch>
Subject: linux-next: manual merge of the clk tree with the mmc tree

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Kconfig between commit c7f6558d84af ("mmc: Add realtek
USB sdmmc host driver") from the mmc tree and commit 3cbcb16095f9
("mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi
SoCs") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/mmc/host/Kconfig
index fd4aab9b79e2,d50ac1ca11ea..000000000000
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -704,9 -695,9 +704,16 @@@ config MMC_REALTEK_PC
  	  Say Y here to include driver code to support SD/MMC card interface
  	  of Realtek PCI-E card reader
  
 +config MMC_REALTEK_USB
 +	tristate "Realtek USB SD/MMC Card Interface Driver"
 +	depends on MFD_RTSX_USB
 +	help
 +	  Say Y here to include driver code to support SD/MMC card interface
 +	  of Realtek RTS5129/39 series card reader
++
+ config MMC_SUNXI
+ 	tristate "Allwinner sunxi SD/MMC Host Controller support"
+ 	depends on ARCH_SUNXI
+ 	help
+ 	  This selects support for the SD/MMC Host Controller on
+ 	  Allwinner sunxi SoCs.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)