Re: linux-next: manual merge of the mmc tree with Linus' tree
From: Chris Ball
Date: Thu Aug 11 2011 - 17:13:47 EST
On Wed, Aug 10 2011, Stephen Rothwell wrote:
> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/sdhci-esdhc-imx.c between commit 913413c307c9 ("mmc:
> sdhci-esdhc-imx: extend card_detect and write_protect support for mx5")
> from Linus' tree and commit 612e807e4852 ("mmc: sdhci-esdhc-imx: Enable
> ADMA2") from the mmc tree.
> I fixed it up (I think - see below) anc can carry the fix as necessary.
Thanks for the conflict fixup. I've merged 3.1-rc1 into mmc-next
and compile-tested for mx35, so the mmc tree should be clean now.
Chris Ball <cjb@xxxxxxxxxx> <http://printf.net/>
One Laptop Per Child
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/