From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mike Turquette <mturquette@linaro•org>, Chris Ball <chris@printf•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Roger Tseng" <rogerable@realtek•com>,
"David Lanzendörfer" <david.lanzendoerfer@o2s•ch>
Subject: linux-next: manual merge of the clk tree with the mmc tree
Date: Wed, 4 Jun 2014 17:10:28 +1000 [thread overview]
Message-ID: <20140604171028.4ea86dc4@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
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@canb•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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-04 7:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 7:10 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-04 7:12 linux-next: manual merge of the clk tree with the mmc tree 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=20140604171028.4ea86dc4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chris@printf$(echo .)net \
--cc=david.lanzendoerfer@o2s$(echo .)ch \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@linaro$(echo .)org \
--cc=rogerable@realtek$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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