> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
