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=-11.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 99378C4727C for ; Tue, 29 Sep 2020 15:35:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3641E207C4 for ; Tue, 29 Sep 2020 15:35:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ffnUz12Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728570AbgI2Pfj (ORCPT ); Tue, 29 Sep 2020 11:35:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728241AbgI2Pfj (ORCPT ); Tue, 29 Sep 2020 11:35:39 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A496C0613D0 for ; Tue, 29 Sep 2020 08:35:39 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id d13so4161863pgl.6 for ; Tue, 29 Sep 2020 08:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=8ouYvJ11GUvmankQF/7U1i7ZXcYaX9D7igBLN8Zdxa0=; b=ffnUz12QPqQ8+EYUCJcWTxFgtMCk6BAB2P/mlYZkUvgK+FzAyWNxmcRAbeHCC5z2gN dfdt2xo3DhM7bBaZkq55I6jeJLlTUCSMc9SRyy4IpvYNnCwYy9Al85AwN58Tfyov/XZf ynqooyn5OcM5BLGpCpyAszVY80XccZDTZfWOuDvb0GNFeoAWgwxSYZoCfDKc1G96aFeU voXfJw2xJP96BJFtOqCNujgz5zfdugKGJzehxI+YzikdJQRGFKEy+8D5gtE+Bn42t4b6 t9kPkm+DfvFEhOsy2fA+jbEY7jMjBfNQqM7Lo1KoekasKBbJYq2xMprKxvqGWweDb9Ss f67Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=8ouYvJ11GUvmankQF/7U1i7ZXcYaX9D7igBLN8Zdxa0=; b=is8Q1LtVMuciGskiGp3rNQUm+C/0050EK7XB/su+hHkuTWJtwEFzQ1owvtvtHGUvEC bzWZoS2nOivgPvSK8rJxr8h2f1rga79A0JIiBIyDu91PKsBQtyw5E+5yqrpYQJxqkgqL nTbgqv8k1XDIn2nKjJV2xDQ19ql6wR+b0gcVPDBfZfPtM7EtBP5eRWRv7mbwHuwaBxy4 IEFY/dEb9hxjhwhIBHUSQJf7ymfMQxELJsN8lbafvo5WWooAycNDlCndlvlPojdHRqU2 DgsCTGt48DpdkbZzfHPc2RloEn8wuWCrzBCv8Tit8o8l41zkrqhAyvJnJ4ijVtPXT/ap PwXg== X-Gm-Message-State: AOAM532GJ2gb/iu1uZAjaUyNblA3wK95uZSp3tOWP+0m01WWipGouEpd rH+B9Z7wD2qlFVzjPLAozUjJ X-Google-Smtp-Source: ABdhPJzqZEBdNDpZI0r75IgOozmaEa/xnQcX3rbHKgba8WbhAS9a5Yr3tOG2O/1frtQUWERSV2rP+A== X-Received: by 2002:a63:5d58:: with SMTP id o24mr1674695pgm.115.1601393738619; Tue, 29 Sep 2020 08:35:38 -0700 (PDT) Received: from Mani-XPS-13-9360 ([103.59.133.81]) by smtp.gmail.com with ESMTPSA id gb19sm5029947pjb.38.2020.09.29.08.35.35 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Sep 2020 08:35:38 -0700 (PDT) Date: Tue, 29 Sep 2020 21:05:31 +0530 From: Manivannan Sadhasivam To: Stephen Rothwell Cc: David Miller , Networking , Govind Singh , Kalle Valo , Loic Poulain , Linux Next Mailing List , Linux Kernel Mailing List , ath11k@lists.infradead.org Subject: Re: linux-next: build failure after merge of the mhi tree Message-ID: <20200929153531.GB17845@Mani-XPS-13-9360> References: <20200928184230.2d973291@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200928184230.2d973291@canb.auug.org.au> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org Hi, On Mon, Sep 28, 2020 at 06:42:30PM +1000, Stephen Rothwell wrote: > Hi all, > > After merging the mhi tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/wireless/ath/ath11k/mhi.c:27:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 27 | .auto_start = false, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:42:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 42 | .auto_start = false, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:57:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 57 | .auto_start = true, > | ^~~~~~~~~~ > drivers/net/wireless/ath/ath11k/mhi.c:72:4: error: 'struct mhi_channel_config' has no member named 'auto_start' > 72 | .auto_start = true, > | ^~~~~~~~~~ > > Caused by commit > > ed39d7816885 ("bus: mhi: Remove auto-start option") > After having the discussion with Kalle, we decided to drop these offending patches from mhi-next (reason is net-next will be broken without these patches). So we'll deal with this in next merge window. Thanks, Mani > interacting with commit > > 1399fb87ea3e ("ath11k: register MHI controller device for QCA6390") > > from the net-next tree. > > I applied the following merge fix patch, but maybe more is required. > Even if so, this could be fixed now in the net-next tree. > > From: Stephen Rothwell > Date: Mon, 28 Sep 2020 18:39:41 +1000 > Subject: [PATCH] fix up for "ath11k: register MHI controller device for QCA6390" > > Signed-off-by: Stephen Rothwell > --- > drivers/net/wireless/ath/ath11k/mhi.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath11k/mhi.c b/drivers/net/wireless/ath/ath11k/mhi.c > index aded9a719d51..47a1ce1bee4f 100644 > --- a/drivers/net/wireless/ath/ath11k/mhi.c > +++ b/drivers/net/wireless/ath/ath11k/mhi.c > @@ -24,7 +24,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = false, > }, > { > .num = 1, > @@ -39,7 +38,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = false, > }, > { > .num = 20, > @@ -54,7 +52,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = false, > - .auto_start = true, > }, > { > .num = 21, > @@ -69,7 +66,6 @@ static struct mhi_channel_config ath11k_mhi_channels[] = { > .offload_channel = false, > .doorbell_mode_switch = false, > .auto_queue = true, > - .auto_start = true, > }, > }; > > -- > 2.28.0 > > -- > Cheers, > Stephen Rothwell