From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63FC8C433EF for ; Wed, 16 Mar 2022 13:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241209AbiCPNhk (ORCPT ); Wed, 16 Mar 2022 09:37:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbiCPNhg (ORCPT ); Wed, 16 Mar 2022 09:37:36 -0400 Received: from out02.mta.xmission.com (out02.mta.xmission.com [166.70.13.232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33DB447075; Wed, 16 Mar 2022 06:36:22 -0700 (PDT) Received: from in01.mta.xmission.com ([166.70.13.51]:35184) by out02.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nUTp6-00BMHf-2H; Wed, 16 Mar 2022 07:36:20 -0600 Received: from ip68-227-174-4.om.om.cox.net ([68.227.174.4]:37920 helo=email.froward.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1nUTp4-00Bptv-1e; Wed, 16 Mar 2022 07:36:19 -0600 From: "Eric W. Biederman" To: Geert Uytterhoeven Cc: Yang Li , Oleg Nesterov , linux-m68k , Linux Kernel Mailing List , Abaci Robot References: <20220315235148.54253-1-yang.lee@linux.alibaba.com> Date: Wed, 16 Mar 2022 08:35:59 -0500 In-Reply-To: (Geert Uytterhoeven's message of "Wed, 16 Mar 2022 08:20:09 +0100") Message-ID: <87pmmm58ao.fsf@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1nUTp4-00Bptv-1e;;;mid=<87pmmm58ao.fsf@email.froward.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=68.227.174.4;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX18H+qCfF1DyV5JF2Ghckp/00rukoXyHPSg= X-SA-Exim-Connect-IP: 68.227.174.4 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: Re: [PATCH -next] ptrace: Remove duplicated include in ptrace.c X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Geert Uytterhoeven writes: > Hi Yang, > > CC Eric > > On Wed, Mar 16, 2022 at 12:52 AM Yang Li wrote: >> Fix following includecheck warning: >> ./arch/m68k/kernel/ptrace.c: linux/ptrace.h is included more than once. >> >> Reported-by: Abaci Robot >> Signed-off-by: Yang Li > > Thanks for your patch! > > Reviewed-by: Geert Uytterhoeven > >> --- a/arch/m68k/kernel/ptrace.c >> +++ b/arch/m68k/kernel/ptrace.c >> @@ -19,7 +19,6 @@ >> #include >> #include >> #include >> -#include >> >> #include >> #include > > 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