lkml.org 
[lkml]   [2020]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the akpm-current tree with the generic-ioremap tree
Hi all,

On Wed, 18 Dec 2019 13:30:25 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/hexagon/include/asm/io.h
>
> between commit:
>
> 1188dd7d3fbd ("remove ioremap_nocache and devm_ioremap_nocache")
>
> from the generic-ioremap tree and commit:
>
> a632c00ae02c ("hexagon: define ioremap_uc")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/hexagon/include/asm/io.h
> index f42d9973e7d6,b0dbc3473172..000000000000
> --- a/arch/hexagon/include/asm/io.h
> +++ b/arch/hexagon/include/asm/io.h
> @@@ -172,7 -172,10 +172,8 @@@ static inline void writel(u32 data, vol
> #define writel_relaxed __raw_writel
>
> void __iomem *ioremap(unsigned long phys_addr, unsigned long size);
> -#define ioremap_nocache ioremap
> + #define ioremap_uc(X, Y) ioremap((X), (Y))
>
> -
> #define __raw_writel writel
>
> static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,

This is now a conflict between Linus' tree and the generic-ioremap tree.

--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2020-01-06 06:03    [W:0.084 / U:3.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site