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 X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7BA04C432BE for ; Thu, 5 Aug 2021 12:24:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FF6761131 for ; Thu, 5 Aug 2021 12:24:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241330AbhHEMYi (ORCPT ); Thu, 5 Aug 2021 08:24:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239571AbhHEMYf (ORCPT ); Thu, 5 Aug 2021 08:24:35 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D84CAC0613C1 for ; Thu, 5 Aug 2021 05:24:20 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id a8so8268937pjk.4 for ; Thu, 05 Aug 2021 05:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=481kLgNLhz1yneJKKCHLaWwT3IQ2qIrRbMfTuoiWLpI=; b=jmzDOOepPLmJiZ/bbOkFEvXBAtiR9fVO4+LNguA3FIU+LGlS+4BFQ2afsIDZ4OIsoq NaPN8JX/ivIW/padho8izo3e7YWe1TsQ4CmqZwEhoTHCzTvzZbkJYPJpuMiVdcSO2FIK u77wpkFg+fzP/a2yU/bSQLE0e+GT2K6CWKBbrn4600S0D0eKONipSRNlnVymL1BT+o06 6OM4k8qf7zHKZbhiwsfqI2PFtGKGnYUnEOE1pV3H9GltI6sEthKlqCDgVUSUIOCIoV6Y AiJSImRSYsgJ+gzEOpDMkW16tXPCHA5h0JRjTbdy7Q8scmUy9VC4jnL59vl+wP4BX5bU c9Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=481kLgNLhz1yneJKKCHLaWwT3IQ2qIrRbMfTuoiWLpI=; b=R6fRR+7IrxI5v3VwihUtQCQ0jra128VRLwUPG8gTlBNMa233nybuyqwW7v+wxqMIiY MO2pb/x6KkeuKB2J2ZtIi1PRTPf9Ap9jxEdfTGoj+CbgJhyDggSEnathSG+o5Ab8E9vB Li3dlDBbXXlghHXP6fIyI6rO7+YZVEoaRKKodK08jwAvDZjyivtohexhWk07YXqxXFQI p6a35OLRu666E9+gTaU8LXl0g2EyqngwSmg43b9ENMRh7AJtfeLcIwl51e/SipYlh+bL AMcFlx3HW6m8IdyElPYAFTdJ8rgttnopnDWyYilsd+pzkJwzT7h0ZQVez7NA4AW/G4/2 H7Zw== X-Gm-Message-State: AOAM533vlTpeacT7uKokXS1hGrgawiNxA4C/N2MipzUNlMda05Jpkv70 Q3O3q84+Hf2q/Ysn7T/3fML7FwmJyrh4VKG15zNTpQ== X-Google-Smtp-Source: ABdhPJyv8N2IN3o+g5lnf89frWzv3h5tJWYb8BR4N5wI6PHWEX9oKKo+NluxGDDt/UcMG3Y4rwQ+FJP1/Lj6QVJnXi4= X-Received: by 2002:a17:90a:5982:: with SMTP id l2mr4594903pji.18.1628166260292; Thu, 05 Aug 2021 05:24:20 -0700 (PDT) MIME-Version: 1.0 References: <20210805120138.23953-1-broonie@kernel.org> In-Reply-To: <20210805120138.23953-1-broonie@kernel.org> From: Loic Poulain Date: Thu, 5 Aug 2021 14:34:02 +0200 Message-ID: Subject: Re: linux-next: build failure after merge of the net-next tree To: Mark Brown Cc: "David S . Miller" , Network Development , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Thu, 5 Aug 2021 at 14:01, Mark Brown wrote: > > Hi all, > > After merging the mac80211-next tree, today's linux-next build > (x86 allmodconfig) failed like this: > > /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe': > /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:611:8: error: too few arguments to function 'mhi_prepare_for_transfer' > err = mhi_prepare_for_transfer(mhi_dev); > ^~~~~~~~~~~~~~~~~~~~~~~~ > In file included from /tmp/next/build/drivers/net/wwan/mhi_wwan_mbim.c:18: > /tmp/next/build/include/linux/mhi.h:726:5: note: declared here > int mhi_prepare_for_transfer(struct mhi_device *mhi_dev, > ^~~~~~~~~~~~~~~~~~~~~~~~ > > > Caused by commit > > aa730a9905b7b079ef2ff ("net: wwan: Add MHI MBIM network driver") Thanks for reporting, I see David already fixed the issue in net-next tree. Actually, we also need the same change for mhi_net driver to fix 7ffa7542eca6 ("net: mhi: Remove MBIM protocol"). diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index d127eb6..975f7f9 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -319,7 +319,7 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev) u64_stats_init(&mhi_netdev->stats.tx_syncp); /* Start MHI channels */ - err = mhi_prepare_for_transfer(mhi_dev); + err = mhi_prepare_for_transfer(mhi_dev, 0); if (err) goto out_err; Regards, Loic > > That API has been modified in ce78ffa3ef16810 ("net: really fix the > build...") in the net tree. I've used the net-next tree from yesterday.