Re: [PATCH -next] ptrace: Remove duplicated include in ptrace.c

From: Eric W. Biederman
Date: Wed Mar 16 2022 - 09:36:28 EST


Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> writes:

> Hi Yang,
>
> CC Eric
>
> On Wed, Mar 16, 2022 at 12:52 AM Yang Li <yang.lee@xxxxxxxxxxxxxxxxx> wrote:
>> Fix following includecheck warning:
>> ./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.
>>
>> Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx>
>> Signed-off-by: Yang Li <yang.lee@xxxxxxxxxxxxxxxxx>
>
> Thanks for your patch!
>
> Reviewed-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
>
>> --- a/arch/m68k/kernel/ptrace.c
>> +++ b/arch/m68k/kernel/ptrace.c
>> @@ -19,7 +19,6 @@
>> #include <linux/ptrace.h>
>> #include <linux/user.h>
>> #include <linux/signal.h>
>> -#include <linux/ptrace.h>
>>
>> #include <linux/uaccess.h>
>> #include <asm/page.h>
>
> This is due to commit 153474ba1a4aed0a ("ptrace: Create
> ptrace_report_syscall_{entry,exit} in ptrace.h"), which is not yet
> in the m68k tree, but only in next-20220315, so I cannot do anything
> about it before v5.18-rc1.
>
> Eric: Can you still fix this in the original commit?

Not unless it is something very serious. Replacing the commit means invalidating
testing and review. Which I would rather not do.

In this case I can merge a trivial fix to remove the duplicate. Let me
find Lang Li's patch and merge that.

Eric