From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Hellwig <hch@lst•de>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Nick Desaulniers <ndesaulniers@google•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the generic-ioremap tree
Date: Mon, 6 Jan 2020 16:02:46 +1100 [thread overview]
Message-ID: <20200106160246.0f6bd04c@canb.auug.org.au> (raw)
In-Reply-To: <20191218133025.15356802@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-01-06 5:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 2:30 linux-next: manual merge of the akpm-current tree with the generic-ioremap tree Stephen Rothwell
2019-12-21 8:32 ` Christoph Hellwig
2019-12-23 22:01 ` Andrew Morton
2020-01-06 5:02 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200106160246.0f6bd04c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ndesaulniers@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox