From: Lauri Hintsala <lauri.hintsala@bluegiga.com>
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,
Chris Ball <cjb@laptop.org>, Marek Vasut <marex@denx.de>
Subject: Re: linux-next: manual merge of the spi-mb tree with the mmc tree
Date: Thu, 06 Sep 2012 09:26:39 +0300 [thread overview]
Message-ID: <5048421F.7080101@bluegiga.com> (raw)
In-Reply-To: <20120905131539.95d7a613d49f741ab6f123a6@canb.auug.org.au>
On 09/05/2012 06:15 AM, Stephen Rothwell wrote:
> 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).
Reviewed and tested. Looks good.
Lauri
prev parent reply other threads:[~2012-09-06 6:26 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
2012-09-06 6:26 ` Lauri Hintsala [this message]
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=5048421F.7080101@bluegiga.com \
--to=lauri.hintsala@bluegiga.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=marex@denx.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.