[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201209050556.34563.marex@denx.de>
Date: Wed, 5 Sep 2012 05:56:34 +0200
From: Marek Vasut <marex@...x.de>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Lauri Hintsala <lauri.hintsala@...egiga.com>,
Chris Ball <cjb@...top.org>
Subject: Re: linux-next: manual merge of the spi-mb tree with the mmc tree
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists