From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Helge Deller <deller@gmx.de>,
Parisc List <linux-parisc@vger.kernel.org>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Rik van Riel <riel@redhat.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree
Date: Tue, 5 Sep 2017 10:34:48 +1000 [thread overview]
Message-ID: <20170905103448.6dfb93eb@canb.auug.org.au> (raw)
In-Reply-To: <20170822165318.77e3e0ca@canb.auug.org.au>
Hi all,
On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> arch/parisc/include/uapi/asm/mman.h
>
> between commit:
>
> 1c190151447d ("parisc: Add MADV_HWPOISON and MADV_SOFT_OFFLINE")
>
> from the parisc-hd tree and commit:
>
> 115d20ededaf ("mm,fork: introduce MADV_WIPEONFORK")
>
> 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.
>
> diff --cc arch/parisc/include/uapi/asm/mman.h
> index 9a9c2fe4be50,f6eec376e5fa..000000000000
> --- a/arch/parisc/include/uapi/asm/mman.h
> +++ b/arch/parisc/include/uapi/asm/mman.h
> @@@ -57,9 -60,9 +57,12 @@@
> overrides the coredump filter bits */
> #define MADV_DODUMP 70 /* Clear the MADV_NODUMP flag */
>
> + #define MADV_WIPEONFORK 71 /* Zero memory on fork, child only */
> + #define MADV_KEEPONFORK 72 /* Undo MADV_WIPEONFORK */
> +
> +#define MADV_HWPOISON 100 /* poison a page for testing */
> +#define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */
> +
> /* compatibility flags */
> #define MAP_FILE 0
> #define MAP_VARIABLE 0
Just a reminder that the above conflict still exists.
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-09-05 0:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-22 6:53 linux-next: manual merge of the akpm-current tree with the parisc-hd tree Stephen Rothwell
2017-09-05 0:34 ` Stephen Rothwell [this message]
2017-09-05 6:09 ` Helge Deller
2017-09-05 6:58 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-05-09 5:33 Stephen Rothwell
2016-09-21 5:20 Stephen Rothwell
2015-03-30 9:09 Stephen Rothwell
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=20170905103448.6dfb93eb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=deller@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=riel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).