From: Marek Vasut <marex@denx.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Lauri Hintsala <lauri.hintsala@bluegiga.com>,
Chris Ball <cjb@laptop.org>
Subject: Re: linux-next: manual merge of the spi-mb tree with the mmc tree
Date: Wed, 5 Sep 2012 05:56:34 +0200 [thread overview]
Message-ID: <201209050556.34563.marex@denx.de> (raw)
In-Reply-To: <20120905131539.95d7a613d49f741ab6f123a6@canb.auug.org.au>
Dear Stephen Rothwell,
> Hi Mark,
>
> Today's linux-next merge of the spi-mb tree got a conflict in
> drivers/mmc/host/mxs-mmc.c between commit fc108d24d3a6 ("mmc: mxs-mmc:
> fix deadlock caused by recursion loop") from the mmc tree and commit
> 829c1bf40b92 ("mmc: spi: Pull out parts shared between MMC and SPI") from
> the spi-mb tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
On a quick glance, it seems correct. Thank you!
Best regards,
Marek Vasut
next prev parent reply other threads:[~2012-09-05 3:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-05 3:15 linux-next: manual merge of the spi-mb tree with the mmc tree Stephen Rothwell
2012-09-05 3:56 ` Marek Vasut [this message]
2012-09-06 6:26 ` Lauri Hintsala
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=201209050556.34563.marex@denx.de \
--to=marex@denx.de \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cjb@laptop.org \
--cc=lauri.hintsala@bluegiga.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).