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

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

[Yang Li]

Fix following includecheck warning:
./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.

Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 arch/m68k/kernel/ptrace.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c
index a0c99fe3118e..6342ff4d2073 100644
--- 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>
-- 
2.20.1.7.g153144c

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

[Geert Uytterhoeven]

Hi Yang,

CC Eric

On Wed, Mar 16, 2022 at 12:52 AM Yang Li <yang.lee@linux.alibaba.com> wrote:
> Fix following includecheck warning:
> ./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.
>
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>

Thanks for your patch!

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>

> --- 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?

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

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

[Eric W. Biederman]

Geert Uytterhoeven <geert@linux-m68k.org> writes:

> Hi Yang,
>
> CC Eric
>
> On Wed, Mar 16, 2022 at 12:52 AM Yang Li <yang.lee@linux.alibaba.com> wrote:
>> Fix following includecheck warning:
>> ./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once.
>>
>> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
>> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
>
> Thanks for your patch!
>
> Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
>
>> --- 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