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 3AD5CC433EF for ; Mon, 18 Jul 2022 22:08:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236344AbiGRWIi (ORCPT ); Mon, 18 Jul 2022 18:08:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235717AbiGRWIg (ORCPT ); Mon, 18 Jul 2022 18:08:36 -0400 Received: from mail-yb1-xb32.google.com (mail-yb1-xb32.google.com [IPv6:2607:f8b0:4864:20::b32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37C6031DE1 for ; Mon, 18 Jul 2022 15:08:35 -0700 (PDT) Received: by mail-yb1-xb32.google.com with SMTP id e69so23416642ybh.2 for ; Mon, 18 Jul 2022 15:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Im+gNjNQiawkcFElqAzCDfzGB6FFifP1C/Cihomf+A4=; b=G2YQWQ9m0SecS2sRuVEf8pIn5HBTTKAcgHcpb+3nBeThtnHyapncJb16wSrgkydKRX /RsMwpWe6axg4EOh0dxrkmuDMbx2sX8/6RmTSit5Bt42d+EljbVS+Yl+ZVY+MxuZhvZX 0HC2qU6rHPDvFzxa9yjbuteS/faoJZW+vGgew= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Im+gNjNQiawkcFElqAzCDfzGB6FFifP1C/Cihomf+A4=; b=QwCiyk8UGzle6UQqe9uf9oXUJLNoGylWrJYwqlIglPg9z+9g8EpNyJ5rCHGMAdbAMq kphVMxDI7TJpyMcrapfhpXuU9UnXlaRvzEnXNRXLnbvOWfm8lWfTM4tRdZ8v/b9Rqc+e Vi2utNx2ZNX2PGBYaFxcfQyUjjGa8KIoMZgt4tApuwY6UiTkGYHSvtjnyJDhOq84jaZH yNPH/khsPfYIEtMwA9p0SyRBUyXVafU9BO8GFJs0BFtYzWJI4GeCZ5KWq6O2KG1rfrHY jo4j7vSMiInLQxF5QbzD1hHB+RIPlAK/PVIJHPaVWNundfUsq+hhC6lGMEpNnWxB2NkJ 2+dw== X-Gm-Message-State: AJIora9FuxofvxGz0a2wro22jeAPegABHVFUyhyC/JEn3q73u8R4HcW1 n7nbg5FydMa7bgt2dqTtSiwHhjgn2qwCY6Fi8Gmquw== X-Google-Smtp-Source: AGRyM1szTTGIztDFCsJ+rOZ1Akq8FG5h7CsQbaIyfbYC+xMo1LLJy5RH7KP2WEUrCZY2Nb3z4vtnDz5pPzyHGAnXQJ0= X-Received: by 2002:a25:dfd6:0:b0:670:24c7:dcc6 with SMTP id w205-20020a25dfd6000000b0067024c7dcc6mr10226037ybg.494.1658182114456; Mon, 18 Jul 2022 15:08:34 -0700 (PDT) MIME-Version: 1.0 References: <20220718163158.42176b4e@canb.auug.org.au> In-Reply-To: From: Prashant Malani Date: Mon, 18 Jul 2022 15:08:20 -0700 Message-ID: Subject: Re: linux-next: build failure after merge of the usb tree To: Greg KH Cc: Stephen Rothwell , Benson Leung , Guenter Roeck , Dmitry Torokhov , Tzung-Bi Shih , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 18, 2022 at 2:41 PM Prashant Malani wrote: > > Hi Stephen & Greg, > > On Mon, Jul 18, 2022 at 1:43 PM Greg KH wrote: > > > > On Mon, Jul 18, 2022 at 04:31:58PM +1000, Stephen Rothwell wrote: > > > Hi all, > > > > > > After merging the usb tree, today's linux-next build (arm > > > multi_v7_defconfig) failed like this: > > > > > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_cmd_mux_set': > > > drivers/platform/chrome/cros_typec_switch.c:52:16: error: implicit declaration of function 'cros_ec_command'; did you mean 'cros_ec_cmd'? [-Werror=implicit-function-declaration] > > > 52 | return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req, > > > | ^~~~~~~~~~~~~~~ > > > | cros_ec_cmd > > > drivers/platform/chrome/cros_typec_switch.c: In function 'cros_typec_register_switches': > > > drivers/platform/chrome/cros_typec_switch.c:244:23: error: implicit declaration of function 'acpi_evaluate_integer'; did you mean 'acpi_evaluate_object'? [-Werror=implicit-function-declaration] > > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index); > > > | ^~~~~~~~~~~~~~~~~~~~~ > > > | acpi_evaluate_object > > > drivers/platform/chrome/cros_typec_switch.c:244:49: error: invalid use of undefined type 'struct acpi_device' > > > 244 | ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index); > > > | ^~ > > > > > > Caused by commit > > > > > > e54369058f3d ("platform/chrome: cros_typec_switch: Add switch driver") > > > > > > and commits > > > > > > 34f375f0fdf6 ("platform/chrome: cros_typec_switch: Set EC retimer") > > > bb53ad958012 ("platform/chrome: cros_typec_switch: Add event check") > > > > > > interacting with commit > > > > > > b1d288d9c3c5 ("platform/chrome: cros_ec_proto: Rename cros_ec_command function") > > > > > > from the chrome-platform tree. > > I am very sorry about the conflicts. > > I can think of a few ways to address this: > 1. A fixup patch on top of linux-next updating the function signature > to cros_ec_cmd() ; I will send this out if you'd like. > 2. Pull in Commit b1d288d9c3c5 ("platform/chrome: cros_ec_proto: > Rename cros_ec_command function") to usb-next. > We will also have to pull in dependent commit 015cd0043503 > ("regulator: cros-ec: Use common cros_ec_command()") > 3. Revert the entire cros-typec-switch (patches 3-9) series from > usb-next and wait till after the merge window to apply it to > chrome-platform directly. > > > > > > > I have used the usb tree from next-20220715 for today. > > > > > > I will fix up the cros_ec_command() rename with a merge fix patch after > > > the apci usage problem is solved. > > Sorry, quick to the trigger (again). Thanks for fixing up the cros_ec_command() rename. Please LMK if any other errors arise from the various patches across branches. BR, -Prashant