From: Chris Ball <cjb@laptop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Richard Zhu <richard.zhu@linaro.org>,
Shawn Guo <shawn.guo@linaro.org>
Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree
Date: Thu, 11 Aug 2011 17:13:19 -0400 [thread overview]
Message-ID: <m2obzvps7k.fsf@bob.laptop.org> (raw)
In-Reply-To: <20110811135555.f4b26adb8a73c1a22f75abc5@canb.auug.org.au> (Stephen Rothwell's message of "Thu, 11 Aug 2011 13:55:55 +1000")
Hi Stephen,
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.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
next prev parent reply other threads:[~2011-08-11 21:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-11 3:55 linux-next: manual merge of the mmc tree with Linus' tree Stephen Rothwell
2011-08-11 21:13 ` Chris Ball [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-05-09 3:44 Stephen Rothwell
2014-05-09 7:14 ` Lee Jones
2014-05-09 7:41 ` Ulf Hansson
2014-05-12 0:11 ` Stephen Rothwell
2014-01-13 2:17 Stephen Rothwell
2014-01-13 17:11 ` Sören Brinkmann
2011-08-03 3:16 Stephen Rothwell
2011-06-01 1:13 Stephen Rothwell
2011-06-01 3:35 ` Shawn Guo
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=m2obzvps7k.fsf@bob.laptop.org \
--to=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=richard.zhu@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=shawn.guo@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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