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 93CEBC636D4 for ; Fri, 10 Feb 2023 20:16:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233620AbjBJUQx (ORCPT ); Fri, 10 Feb 2023 15:16:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233601AbjBJUQr (ORCPT ); Fri, 10 Feb 2023 15:16:47 -0500 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A55237A7F5 for ; Fri, 10 Feb 2023 12:16:45 -0800 (PST) Received: by mail-pg1-x531.google.com with SMTP id x10so4488535pgx.3 for ; Fri, 10 Feb 2023 12:16:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1676060205; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=EvG8ud036bG0Ka459g+GKn8ZfnyHhVaXS8x0E5NDNX0=; b=LM0SABIxTnYfDjC0tb3g9hN4ycdijLB8RtQ6CjWZ5PVJHtpPxh1QGSJ2/Wd8FD2cLX EjDYVFmPj4YuaLm+eeJe9LxIj2ufXmZ7IB5IMq+rCBUNc9LdFM3HvC0djcxvLnxP6nWk W8315heKNcI1lFTPtPtn6CLu24giSOk5SqWXqBM3gE+RmtfHZrO+TGhZgb+vuF6fSl9p ZML1CzR8MQvnOJ8E8AZI+orFi7J7UzAldjlgeeuRbBj2TAxBM8Rnoc/kObb9Y55q0/hS 1TxjLnpy6+uvS0g+VymBXMiSI4sDTXUB/UZ20kEwDk3H9epF5rA5bvz2D1Y9t7KAEGe3 lnDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676060205; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=EvG8ud036bG0Ka459g+GKn8ZfnyHhVaXS8x0E5NDNX0=; b=DfsYtU0bIjIJwa0CLdiODIj0LtxwK1sm05D+G1C4zl+ZdjCI/fJAOdmDWvywfelfo8 M1cjhWTNyDiW+9161IWCv1U1hFOPiAbmRtpWAPorQWiPEWBu98ilOpOBTAlF20ir6uLE pL2QSYhrM7XDsOJ4NKM5oaMEGxT97ugwQPFisC4HmlPQLNBUqx4qOe59xLzELzwVwz2d VIvxwDq4j/MrmE7qOvQp3Xm/3B6MskwAjg+4pUsk11JnvxlPSZYeAwvjyjcgHUwWowHC c681NpCeBrjmiRGlJ5QUMeV5ylC2oSWIguCIjnJABfLniYToA3+tO0+jeCEruJoX7PzP 4AQQ== X-Gm-Message-State: AO0yUKUdYtkVtlReUhbbIURR2ySHCLJj5ku0etvImrjLttQQJJ8rRgXg RHpDGLqp05jKxkx1aMOIx2C0nU1SdO7H5cnP9rZQHw== X-Google-Smtp-Source: AK7set/0b8F/MfV9JCwQ1S3R3HgjZhxcQHwcE6oll9s5wRLKhHO+9p9yqwo1eqDd9nV0YxytHo7Bl1tjeC9dKMjcXUs= X-Received: by 2002:a62:8489:0:b0:5a8:4dea:7015 with SMTP id k131-20020a628489000000b005a84dea7015mr1901634pfd.36.1676060204745; Fri, 10 Feb 2023 12:16:44 -0800 (PST) MIME-Version: 1.0 References: <202302101520071730986@zte.com.cn> In-Reply-To: From: Saravana Kannan Date: Fri, 10 Feb 2023 12:16:08 -0800 Message-ID: Subject: Re: [PATCH] firmware: arm_scmi: remove duplicate include header To: Cristian Marussi Cc: ye.xingchen@zte.com.cn, sudeep.holla@arm.com, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 10, 2023 at 3:29 AM Cristian Marussi wrote: > > On Fri, Feb 10, 2023 at 03:20:07PM +0800, ye.xingchen@zte.com.cn wrote: > > From: Ye Xingchen > > > > linux/of.h is included more than once. > > > > Signed-off-by: Ye Xingchen > > --- > > drivers/firmware/arm_scmi/bus.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c > > index 73140b854b31..b2d242178fbc 100644 > > --- a/drivers/firmware/arm_scmi/bus.c > > +++ b/drivers/firmware/arm_scmi/bus.c > > @@ -14,7 +14,6 @@ > > #include > > #include > > #include > > -#include > > > > Hi Ye, > > thanks for this. > > Looking at next-20230210 it seem like the linux/of.h include that you > removed was added by: > > commit 96da4a99ce507bb98e2ba77018a2f91999c8c12b > Author: Saravana Kannan > Date: Mon Feb 6 17:42:03 2023 -0800 > > firmware: arm_scmi: Set fwnode for the scmi_device > > ...AND indeed there was already a linux/of.h include added by a preceding > commit by myself > > commit d3cd7c525fd2ecce3a6c963f314969a54783d211 > Author: Cristian Marussi > Date: Thu Dec 22 18:50:45 2022 +0000 > > firmware: arm_scmi: Refactor protocol device creation > > ...BUT they both hit next- together so the clash. > > My series is queued for the next merge window on soc/, not sure about the > state of Saravana series, but if that series will be queued too for v6.3 > we'll need to pick up your fix indeed, Ye. AFAIU, my series is queued up for 6.3. -Saravana