Hi Helge, On Tue, 5 Sep 2017 08:09:01 +0200 Helge Deller <deller@xxxxxx> wrote: > > >> 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. These simple conflicts are not really a problem (Linus is happy to cope with them). I just send these messages out for consistency and openness. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
