Please pull mmc mmc-2-19-2020

[Peng Fan]

> Subject: Re: Please pull mmc mmc-2-19-2020
> 
> Hi Peng,
> 
> On Thu, Feb 20, 2020 at 1:34 PM Tom Rini <trini at konsulko.com> wrote:
> >
> > On Thu, Feb 20, 2020 at 01:56:41AM +0000, Peng Fan wrote:
> >
> > > Hi Tom
> > >
> > > Please pull mmc-2-29-2020.
> > >
> >
> > NAK, this breaks nios2:
> >      nios2:  +   10m50 3c120
> > +(10m50,3c120) ../drivers/net/altera_tse.c: In function 'altera_tse_probe':
> > +(10m50,3c120) ../drivers/net/altera_tse.c:646:15: error: implicit
> declaration of function 'dma_alloc_coherent'; did you mean 'lmb_alloc_addr'?
> [-Werror=implicit-function-declaration]
> > +(10m50,3c120)     desc_mem = dma_alloc_coherent(len, &addr);
> > +(10m50,3c120)                ^~~~~~~~~~~~~~~~~~
> > +(10m50,3c120)                lmb_alloc_addr
> > +(10m50,3c120) ../drivers/net/altera_tse.c:646:13: error: assignment
> makes pointer from integer without a cast [-Werror=int-conversion]
> > +(10m50,3c120)              ^
> > +(10m50,3c120) cc1: all warnings being treated as errors
> > +(10m50,3c120) make[2]: *** [drivers/net/altera_tse.o] Error 1
> > +(10m50,3c120) make[1]: *** [drivers/net] Error 2
> > +(10m50,3c120) make: *** [sub-make] Error 2

I not met such issue in github ci.

> >
> > --
> > Tom
> 
> 
> Agh, something strange happens somehow in the following commit.
> 
> commit 87a6590d6eb500db95bcdb09c16efb16559f67c6
> Author: Masahiro Yamada <yamada.masahiro at socionext.com>
> Date:   Fri Feb 14 16:40:20 2020 +0900
> 
>     dma-mapping: add <asm/dma-mapping.h> for all architectures
> 
> 
> 
> Peng,
> 
> Could you replace it with this?

Replaced. If there still build issue, I'll drop this single patch in this pull request.

Thanks,
Peng.

> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fpatchw
> ork.ozlabs.org%2Fpatch%2F1241209%2F&data=02%7C01%7Cpeng.fan%
> 40nxp.com%7C7dfca232910b461e892508d7b5c46682%7C686ea1d3bc2b4c6
> fa92cd99c5c301635%7C0%7C0%7C637177727450297022&sdata=bwE9
> pa9V80pmSD6%2FP4vMfBNt8xkJ%2B8R60%2FwM1xkhNGY%3D&reserv
> ed=0
> 
> (Or, just revert the diff for arch/nios2/include/asm/dma-mapping)
> 
> 
> 
> 
> --
> Best Regards
> Masahiro Yamada