Messages in this thread | | | Date | Thu, 06 Sep 2012 09:26:39 +0300 | From | Lauri Hintsala <> | Subject | Re: linux-next: manual merge of the spi-mb tree with the mmc tree |
| |
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
| |