Re: linux-next: build failure after merge of the mm tree
From: Christian Brauner
Date: Mon Jan 30 2023 - 03:12:13 EST
On Mon, Jan 30, 2023 at 04:14:14PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mm tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> kernel/sys.c: In function '__do_sys_prctl':
> kernel/sys.c:2664:9: error: duplicate case value
> 2664 | case PR_SET_HIDE_SELF_EXE:
> | ^~~~
> kernel/sys.c:2655:9: note: previously used here
> 2655 | case PR_SET_MDWE:
> | ^~~~
> kernel/sys.c:2669:9: error: duplicate case value
> 2669 | case PR_GET_HIDE_SELF_EXE:
> | ^~~~
> kernel/sys.c:2658:9: note: previously used here
> 2658 | case PR_GET_MDWE:
> | ^~~~
>
> Caused by commit
>
> ab30677b499c ("mm: implement memory-deny-write-execute as a prctl")
>
> interacting with commit
>
> 966eb1ba050d ("exec: add PR_HIDE_SELF_EXE prctl")
>
> from the pidfd tree.
>
> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 30 Jan 2023 16:08:34 +1100
> Subject: [PATCH] mm: fixup for "mm: implement memory-deny-write-execute as a prctl"
>
> interacting with
>
> 966eb1ba050d ("exec: add PR_HIDE_SELF_EXE prctl")
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
Thanks Stephen,
I'm moving this out of -next for now until we've settled a few more
details.
Christian