Subject: Re: linux-next: manual merge of the mmc tree with Linus' tree

From: Lee Jones <[email-masked]>
Date: Fri, 9 May 2014 08:14:23 +0100

> Today's linux-next merge of the mmc tree got a conflict in
> drivers/mmc/host/rtsx_pci_sdmmc.c between commit 98fcc5762dce ("mmc:
> rtsx: Revert "mmc: rtsx: add support for pre_req and post_req"") from
> the  tree and commit 1f7b581b3ffc ("mmc: rtsx: modify error handle and
> remove smatch warnings") from the mmc tree.
> 
> I fixed it up (maybe - see below and in the final tree) and can carry
> the fix as necessary (no action is required).

FYI: From what Ulf (co-maintainer of MMC) says, this was expected and
will continue to happen until a pending revert is merged.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog