Hi Simon,
On Wed, May 10, 2017 at 11:50 AM, Simon Horman
<horms+renesas@xxxxxxxxxxxx> wrote:
> please consider pulling the refactoring of DMA support for SDHI (v2).
>
> This pull request is based on mmc-v4.12.
>
> As this pull request conflicts with recent work by Wolfram,
> "[PULL REQUEST] renesas/topic/sdhi-cmd23 for renesas drivers",
> I have provided a sample merge resolution at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git topic/sdhi-refactor-v2+sdhi-cmd23
>
>
> The following changes since commit a627f025eb0534052ff451427c16750b3530634c:
>
> mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a (2017-04-28 14:53:13 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git topic/sdhi-refactor-v2
>
> for you to fetch changes up to 2156a07053f52c85fba8b715116b0241d5fca25b:
>
> mmc: renesas-sdhi: make renesas_sdhi_sys_dmac main module file (2017-05-09 15:19:55 +0200)
Thank you. Looks good, and merges cleanly into today's linux-next.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
