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,
"Jonas Jensen" <jonas.jensen@gmail•com>,
"David Lanzendörfer" <david.lanzendoerfer@o2s•ch>,
"Hans de Goede" <hdegoede@redhat•com>,
"Ulf Hansson" <ulf.hansson@linaro•org>
Subject: linux-next: manual merge of the clk tree with the mmc tree
Date: Wed, 4 Jun 2014 17:12:54 +1000 [thread overview]
Message-ID: <20140604171254.6a67ba4f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1119 bytes --]
Hi Mike,
Today's linux-next merge of the clk tree got a conflict in
drivers/mmc/host/Makefile between commit 1b66e94e6b99 ("mmc: moxart:
Add MOXA ART SD/MMC 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/Makefile
index 997912262499,3072bfb6d26a..000000000000
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -50,10 -50,9 +50,11 @@@ obj-$(CONFIG_MMC_JZ4740) += jz4740_mmc.
obj-$(CONFIG_MMC_VUB300) += vub300.o
obj-$(CONFIG_MMC_USHC) += ushc.o
obj-$(CONFIG_MMC_WMT) += wmt-sdmmc.o
+obj-$(CONFIG_MMC_MOXART) += moxart-mmc.o
+ obj-$(CONFIG_MMC_SUNXI) += sunxi-mmc.o
obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
+obj-$(CONFIG_MMC_REALTEK_USB) += rtsx_usb_sdmmc.o
obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o
obj-$(CONFIG_MMC_SDHCI_CNS3XXX) += sdhci-cns3xxx.o
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-06-04 7:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 7:12 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-06-04 7:10 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=20140604171254.6a67ba4f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chris@printf$(echo .)net \
--cc=david.lanzendoerfer@o2s$(echo .)ch \
--cc=hdegoede@redhat$(echo .)com \
--cc=jonas.jensen@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@linaro$(echo .)org \
--cc=ulf.hansson@linaro$(echo .)org \
/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