On 20 January 2015 at 04:17, Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi Ulf,
>
> Today's linux-next merge of the mmc-uh tree got a conflict in
> drivers/mmc/host/sunxi-mmc.c between commit 6c09bb851e57 ("mmc: sunxi:
> Convert MMC driver to the standard clock phase API") from the sunxi
> tree and commit 776e24c502da ("mmc: sunxi: Removing unused code") from
> the mmc-uh tree.
>
> I fixed it up (the former includes the latter change) and can carry the
> fix as necessary (no action is required).Maxime, I can't find the sunxi tree, is it listed in MAINTAINERS? I know I have acked below patch, but that was quite a I while ago. Is there any reason to why I can't take it through my mmc tree at this point? "mmc: sunxi: Convert MMC driver to the standard clock phase API". Kind regards Uffe > > -- > Cheers, > Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
