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 20DFCEE49A0 for ; Mon, 21 Aug 2023 07:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233572AbjHUHHk (ORCPT ); Mon, 21 Aug 2023 03:07:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232267AbjHUHHi (ORCPT ); Mon, 21 Aug 2023 03:07:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6C278A6; Mon, 21 Aug 2023 00:07:37 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED039622C2; Mon, 21 Aug 2023 07:07:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75599C433CB; Mon, 21 Aug 2023 07:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1692601656; bh=rleqVYy2qIaZrPoooHLDOInMDjXB7aXLt+bD2ispE0o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=IrdrCLz7fc/llwJ/DpVOECYwrOboafhrtNJ6ATnMpC/PNABTNiyyjTrxKDMngi0cZ zDjEQgEY3v7tQzxzqBMb1gF3I7UZUaYUHBIlVmvAHTx0iGM0EmMytSE5+Eq1EXIzuI 2dBf//lsMnKQjPkNHGXqROy9SOxPSS+OZOAMNr5w6Q3bQagG4fgcKHeZdYzF/L8ZiR 3FTiJkcCLfa51nb3Io3dnyAnM0NJRubZiv+L4V+5VSXAe7DDQ+hDZJPMIAR7H2uPpn 9+8F71RY3AdeXXnWrFB7bmxtixsRTnKbYRmGf6ayYJlNWEfmhLjy7ia2zsV+FHqH8h c+9EwonOyybbQ== Date: Mon, 21 Aug 2023 08:07:31 +0100 From: Lee Jones To: Stephen Rothwell Cc: Sebastian Reichel , Jakob Hauser , Rob Herring , Sebastian Reichel , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: build failure after merge of the battery tree Message-ID: <20230821070731.GB1380343@google.com> References: <20230821125741.3a2474d7@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230821125741.3a2474d7@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 21 Aug 2023, Stephen Rothwell wrote: > Hi all, > > After merging the battery tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/power/supply/rt5033_charger.c: In function 'rt5033_charger_probe': > drivers/power/supply/rt5033_charger.c:694:19: error: implicit declaration of function 'of_parse_phandle' [-Werror=implicit-function-declaration] Is this because your merge-conflict patch: linux-next: manual merge of the battery tree with the mfd tree ... removed of_device.h? > 694 | np_conn = of_parse_phandle(pdev->dev.of_node, "richtek,usb-connector", 0); > | ^~~~~~~~~~~~~~~~ > drivers/power/supply/rt5033_charger.c:694:17: error: assignment to 'struct device_node *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 694 | np_conn = of_parse_phandle(pdev->dev.of_node, "richtek,usb-connector", 0); > | ^ > drivers/power/supply/rt5033_charger.c:695:19: error: implicit declaration of function 'of_get_parent'; did you mean 'kernfs_get_parent'? [-Werror=implicit-function-declaration] > 695 | np_edev = of_get_parent(np_conn); > | ^~~~~~~~~~~~~ > | kernfs_get_parent > drivers/power/supply/rt5033_charger.c:695:17: error: assignment to 'struct device_node *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion] > 695 | np_edev = of_get_parent(np_conn); > | ^ > > Caused by commit > > 2ce8284c3115 ("power: Explicitly include correct DT includes") > > interacting with commit > > 12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB OTG supply") > > from the mfd tree. > > I have applied the following merge fix patch. > > From: Stephen Rothwell > Date: Mon, 21 Aug 2023 12:50:12 +1000 > Subject: [PATCH] fixup for "power: Explicitly include correct DT includes" > > interacting with commit > > 12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB OTG supply") > > Signed-off-by: Stephen Rothwell > --- > drivers/power/supply/rt5033_charger.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/power/supply/rt5033_charger.c b/drivers/power/supply/rt5033_charger.c > index 4d1198d752b7..4ea769775fa5 100644 > --- a/drivers/power/supply/rt5033_charger.c > +++ b/drivers/power/supply/rt5033_charger.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > -- > 2.40.1 > > -- > Cheers, > Stephen Rothwell -- Lee Jones [李琼斯]