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=ham 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 97805C2D0A8 for ; Mon, 28 Sep 2020 09:10:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 49B16205F4 for ; Mon, 28 Sep 2020 09:10:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="i0OWzrKQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726652AbgI1JKw (ORCPT ); Mon, 28 Sep 2020 05:10:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbgI1JKn (ORCPT ); Mon, 28 Sep 2020 05:10:43 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C17A7C0613CF for ; Mon, 28 Sep 2020 02:10:42 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id s31so306528pga.7 for ; Mon, 28 Sep 2020 02:10:42 -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=O1+yMppnDpNfXMAMC1ZdSEkZ8OlKvslG0pRoiuAQVN0=; b=i0OWzrKQVRrRW+5vXExQR3uFGBu7++GZTpfFtp5wxHPGl0QVi/qJ5OUbL+jt4X7zzi XVO9IAPOK/g3UxE4+rNRbdNk6MK0TsqAr9l501hzNxohI0lrw+TYEUAUHVj5nSSPqOU1 +odUFDTyM9fc0fflVZx0LR8MKZnZLUbZ0w1BuUdCcjUJONhQ7IEqoSUZ+3vRBjRG/Rg2 3vabPIqfBohFl4gq4MAgOQyY4Bt7VpaeR67t7JwpcFaYb5sxz1ZjYyGJt4BCwYTHtdGr Vx3R+P3e8jndccEUgwlRDv7eI/BuOp7ace5krUyQkMkskRGkMfbAlFjdT9GpOFgCXeUQ XlTQ== 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=O1+yMppnDpNfXMAMC1ZdSEkZ8OlKvslG0pRoiuAQVN0=; b=jkjc6iQxgFWg8Xiv8icLIjmePcNBrl+w47p1IokYkfy9vIYDzHGS2YCdCsLq454dnq OW3cPbQtA2PxwQCjBl2xjTw2ng5f6pE12U2Y8mfOUOkb538alpFtPA5DnjquxFRcfiN4 cxeQ0v3Pz5jtEnqJHq+ZChFnZ63aSRmYMQDxcMdaUGUC3FD53XzleJsmOXW/w4SBoswU GdbaUwzC5BeCHYlLearbZy66JS0jKSHx3kZ99gj54fTFevTeFv3kv2o6iRUR0LQmaGpA Ezra5C+LRqTJB/ymV5Vn+uiqCaLWcHRAhCx75/2rw/44RJ/NfdiJKnTFBW2W0apiQXdO SkPg== X-Gm-Message-State: AOAM531aXRI7zaJYC2BS3LzQ7+c3+keEZJmhYs1t7EhJthcrwDOpVCGS XG5+lBwgQbI3SCdGNzkZvdvS X-Google-Smtp-Source: ABdhPJxz0IdBuu8ZZQnGUY8fl5P06ZoniHdCD4o7XYloBPzjr6aas9+xPzk+z1uzjfdwDZhKnE47gA== X-Received: by 2002:a62:8205:0:b029:151:c014:6915 with SMTP id w5-20020a6282050000b0290151c0146915mr591925pfd.51.1601284242177; Mon, 28 Sep 2020 02:10:42 -0700 (PDT) Received: from linux ([103.59.133.81]) by smtp.gmail.com with ESMTPSA id q15sm697928pgr.27.2020.09.28.02.10.39 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 28 Sep 2020 02:10:41 -0700 (PDT) Date: Mon, 28 Sep 2020 14:40:35 +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 Subject: Re: linux-next: build failure after merge of the mhi tree Message-ID: <20200928091035.GA11515@linux> 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: netdev@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") > > 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 Sorry, I forgot to submit a patch against net-next for fixing this while merging the MHI change. But your change looks good and I can just modify the subject/description and resubmit. Or if Dave prefers to fix the original commit itself in net-next, I'm fine! Thanks, Mani > --- > 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