From patchwork Fri Aug 27 02:22:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 503685 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=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, 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 EEAD5C4320E for ; Fri, 27 Aug 2021 02:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D1EE960F92 for ; Fri, 27 Aug 2021 02:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244065AbhH0CXp (ORCPT ); Thu, 26 Aug 2021 22:23:45 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:36781 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231613AbhH0CXo (ORCPT ); Thu, 26 Aug 2021 22:23:44 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Gwk5V1JX3z9sPf; Fri, 27 Aug 2021 12:22:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1630030974; bh=5OKZbg1/z7zbffHv9CDZilC29dWz0b3Vl0KH7ueFMi4=; h=Date:From:To:Cc:Subject:From; b=pTKMbFJ4Af62VbdkHiwrTvTh9SRTTbg9+Q1hmnVurSUUq9ce9ZfeN4XsB5hCbVHJl J+x4947BxyEJ7PFtgumvcsLSW0IxjDJmeXDuzqT4KGOqxQY8svIWJ1kAbOkfULyCXR evWDNbUUgRBOblU/pmCs83lWTLD22OEhja1akd9hbKuat7GQSNIUa9VlC+D93cVDEb 5ysALepnsfLbNRZA/dbfkaCmIV6CmM/de+wotD0t2GzrS4SAY68pHXN6GlVH7+SGvm ky67y/KT0VTDG8+oamN1sx4U0O5mJQCXMAYyC4GovgPHnaH6Oe2fZ97pJs8ls1nNIW mpTFeExxNb5oQ== Date: Fri, 27 Aug 2021 12:22:52 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Loic Poulain , Jakub Kicinski , Kalle Valo , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the net-next tree Message-ID: <20210827122252.3d310dca@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi all, After merging the net-next tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/net/wwan/mhi_wwan_mbim.c: In function 'mhi_mbim_probe': drivers/net/wwan/mhi_wwan_mbim.c:612:8: error: too many arguments to function 'mhi_prepare_for_transfer' 612 | err = mhi_prepare_for_transfer(mhi_dev, 0); | ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/net/wwan/mhi_wwan_mbim.c:18: include/linux/mhi.h:725:5: note: declared here 725 | int mhi_prepare_for_transfer(struct mhi_device *mhi_dev); | ^~~~~~~~~~~~~~~~~~~~~~~~ Caused by commits aa730a9905b7 ("net: wwan: Add MHI MBIM network driver") ab996c420508 ("wwan: mhi: Fix build.") a85b99ab6abb ("Revert "wwan: mhi: Fix build."") 0ca8d3ca4561 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net") interacting with commit 9ebc2758d0bb ("Revert "net: really fix the build..."") from Linus' tree. I have applied the following merge fix patch for today. From: Stephen Rothwell Date: Fri, 27 Aug 2021 12:02:29 +1000 Subject: [PATCH] fix for commit 9ebc2758d0bb "Revert "net: really fix the build..."" Signed-off-by: Stephen Rothwell --- drivers/net/wwan/mhi_wwan_mbim.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wwan/mhi_wwan_mbim.c b/drivers/net/wwan/mhi_wwan_mbim.c index 377529bbf124..71bf9b4f769f 100644 --- a/drivers/net/wwan/mhi_wwan_mbim.c +++ b/drivers/net/wwan/mhi_wwan_mbim.c @@ -609,7 +609,7 @@ static int mhi_mbim_probe(struct mhi_device *mhi_dev, const struct mhi_device_id INIT_DELAYED_WORK(&mbim->rx_refill, mhi_net_rx_refill_work); /* Start MHI channels */ - err = mhi_prepare_for_transfer(mhi_dev, 0); + err = mhi_prepare_for_transfer(mhi_dev); if (err) return err;