From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750955AbdIEGJT (ORCPT ); Tue, 5 Sep 2017 02:09:19 -0400 Received: from mout.gmx.net ([212.227.15.18]:54577 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750707AbdIEGJR (ORCPT ); Tue, 5 Sep 2017 02:09:17 -0400 Subject: Re: linux-next: manual merge of the akpm-current tree with the parisc-hd tree To: Andrew Morton Cc: Stephen Rothwell , Parisc List , Linux-Next Mailing List , Linux Kernel Mailing List , Rik van Riel References: <20170822165318.77e3e0ca@canb.auug.org.au> <20170905103448.6dfb93eb@canb.auug.org.au> From: Helge Deller Message-ID: Date: Tue, 5 Sep 2017 08:09:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <20170905103448.6dfb93eb@canb.auug.org.au> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:MfaLQ9pJ3BVGIsfO3xRq/4zAAteSAE54HAOp7uX3Y8B2bi6uuxq sFw57GezQZhs0fE6FTxiJ9paTo5iZvibXkBBfyY3wZ01uH0FIJzBOFMHo44WwrQ3SByhIWd v9jxbnSGVwvzJxCresMQ3pWZEMa1Pxx50COdHfw+N3UcjV6L4Nff0+E4NPYikERVQBcuMsy x3Fcb8rYCvQGOPhVLztUQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:3iv0H2Z8CXw=:LWV+npTsIvUeQbyA1iRJGW LIJZyTqOKRBxlmPVWuGijmWTEujhKDBDMIjwNNGRiRw+WB97W41VxLGAbtEE9kvea34d/dbON XEXnp2zyXFstj/R24RWetV9L/eIYfyNfAfyJDNWeV3wu17Qw63pzyxEORq9BZBPte5FzVlGXc HruE03XHrPpPRB3ORCqgiYuCRH/pRZfHomxUaZBv0BBMV1Ibb9wr1dRHxxf1wP9XSFgTPp2VD NlcvLIDosMy1v9E/yMytAciR3+y0UbFVniDz1VOmuGMgLFztKYQMS85fnB5neyjxyNJ3kyTUO sW3zVAjAdDiTV/lJ4oQvCB+4/OFUd4WRUL7VbjM79SGt7m4TbTApj8ni6K57vP8AfjWANf22L u7YeeKUf+pVsYNPaJ90r5Ds04fEkphouE5SzVb6YOgSGC6zFQSwd5CgYVVTZuqRHTGZ2fItzy 1Umoj61Lxthwmt4ydQtgW0he+Rng+pQd/ANiE/zURwLM1cpudHZewxl32q8pWPdsJSCvlrxrB qgkyKEo+LOFfzvogNfknjw53mD90HVLCigXUChbkjzcs0vu2gA4t2oiY1FFXl2/+IuFxl78VP W7kBA4k2xSiETDX+RGMJZfdLElbugtWHBequWmG5w9vkFbjvAlHkcKg5KqsnYx5j9pdUlDObF OMDzSZAuvWXI8/KlD3bg7K5xOiCeoANpC75FlxKKLhytbixyHOyQjnPCoQsr7Ed0+qKQ7DjBs KEdktGfLTne0r+Io6Y/lkr4W552oms7rx9tPKEBb7aKFaA1VTRGAWOSVN77ujEqKKoDazn0Ik f8nel17mIz/TJBURfAYCT9U0Mkl4+rZg3X+d3Qubd/grLKSOXI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05.09.2017 02:34, Stephen Rothwell wrote: > Hi all, > > On Tue, 22 Aug 2017 16:53:18 +1000 Stephen Rothwell 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. Thanks Stephen! @Andrew, I can push the addition of those two MADV_ constants to arch/parisc/include/uapi/asm/mman.h through the parisc git tree, if you drop this part from your patchset. Otherwise, just let me know how you prefer to solve this merge conflict. Helge