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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
