linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: arch/Kconfig between commit: 5a3a47bf8367 ("orphans: Hoist '--orphan-handling' into Kconfig") from the kspp tree and commits: 84d8b3661cc9 ("arm, arm64: move free_unused_memmap() to generic mm") 46b9b00649f6

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: scripts/gcc-plugins/Kconfig between commit: 9219e54be983 ("gcc-plugins: structleak: Generalize to all variable types") from the kspp tree and commit: 7fabedf42152 ("kasan: remove use after scope bugs

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

On Mon, Jan 15, 2018 at 4:41 AM, Arnd Bergmann wrote: > On Mon, Jan 15, 2018 at 5:57 AM, Stephen Rothwell > wrote: >> Hi Andrew, >> >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> arch/cris/include/arch-v10/arch/bug.h >> >>

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

On Mon, Jan 15, 2018 at 4:41 AM, Arnd Bergmann wrote: > On Mon, Jan 15, 2018 at 5:57 AM, Stephen Rothwell > wrote: >> Hi Andrew, >> >> Today's linux-next merge of the akpm-current tree got a conflict in: >> >> arch/cris/include/arch-v10/arch/bug.h >> >> between commit: >> >> c8133e59edb0

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

On Mon, Jan 15, 2018 at 5:57 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/cris/include/arch-v10/arch/bug.h > > between commit: > > c8133e59edb0 ("cris: Mark end of BUG() implementation as

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

On Mon, Jan 15, 2018 at 5:57 AM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > arch/cris/include/arch-v10/arch/bug.h > > between commit: > > c8133e59edb0 ("cris: Mark end of BUG() implementation as unreachable") > > from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/cris/include/arch-v10/arch/bug.h between commit: c8133e59edb0 ("cris: Mark end of BUG() implementation as unreachable") from the kspp tree and commit: c5a1e183a75a ("bug.h: work around GCC PR82365 in

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/cris/include/arch-v10/arch/bug.h between commit: c8133e59edb0 ("cris: Mark end of BUG() implementation as unreachable") from the kspp tree and commit: c5a1e183a75a ("bug.h: work around GCC PR82365 in

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/fork.c between commit: 962b2ff950dd ("fork: Define usercopy region in mm_struct slab caches") 41359fc82cc7 ("fork: Provide usercopy whitelisting for task_struct") from the kspp tree and commit:

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: kernel/fork.c between commit: 962b2ff950dd ("fork: Define usercopy region in mm_struct slab caches") 41359fc82cc7 ("fork: Provide usercopy whitelisting for task_struct") from the kspp tree and commit:

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Tue, 20 Jun 2017 15:15:49 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/sem.h > > between commit: >

Re: linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Tue, 20 Jun 2017 15:15:49 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > include/linux/sem.h > > between commit: > > 1a12979f61e4

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/ipc.h between commit: 1a12979f61e4 ("randstruct: Mark various structs for randomization") from the kspp tree and commit: 893106d6be17 ("ipc: merge ipc_rcu and kern_ipc_perm") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/ipc.h between commit: 1a12979f61e4 ("randstruct: Mark various structs for randomization") from the kspp tree and commit: 893106d6be17 ("ipc: merge ipc_rcu and kern_ipc_perm") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/sem.h between commit: 1a12979f61e4 ("randstruct: Mark various structs for randomization") from the kspp tree and commit: 337e62a32a54 ("ipc/sem.c: remove sem_base, embed struct sem") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/sem.h between commit: 1a12979f61e4 ("randstruct: Mark various structs for randomization") from the kspp tree and commit: 337e62a32a54 ("ipc/sem.c: remove sem_base, embed struct sem") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: arch/x86/Kconfig.debug arch/x86/kernel/Makefile between commits: ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common") 3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi all, Today's linux-next merge of the akpm-current tree got conflicts in: arch/x86/Kconfig.debug arch/x86/kernel/Makefile between commits: ad21fc4faa2a ("arch: Move CONFIG_DEBUG_RODATA and CONFIG_SET_MODULE_RONX to be common") 3ad38ceb2769 ("x86/mm: Remove CONFIG_DEBUG_NX_TEST")

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 228d96c603cf ("kbuild: Abort build on bad stack protector flag") from the kspp tree and commit: f273155b8dc7 ("kbuild: abort build on bad stack protector flag") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 228d96c603cf ("kbuild: Abort build on bad stack protector flag") from the kspp tree and commit: f273155b8dc7 ("kbuild: abort build on bad stack protector flag") from the

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: 0df42965deb7 ("latent_entropy: Add the extra_latent_entropy kernel parameter") from the kspp tree and commit: 6f4f5445297d ("mm: charge/uncharge kmemcg from generic page

linux-next: manual merge of the akpm-current tree with the kspp tree

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: mm/page_alloc.c between commit: 0df42965deb7 ("latent_entropy: Add the extra_latent_entropy kernel parameter") from the kspp tree and commit: 6f4f5445297d ("mm: charge/uncharge kmemcg from generic page