From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Manivannan Sadhasivam <manivannan.sadhasivam@linaro•org>,
David Miller <davem@davemloft•net>,
Networking <netdev@vger•kernel.org>
Cc: Govind Singh <govinds@codeaurora•org>,
Kalle Valo <kvalo@codeaurora•org>,
Loic Poulain <loic.poulain@linaro•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: build failure after merge of the mhi tree
Date: Mon, 28 Sep 2020 18:42:30 +1000 [thread overview]
Message-ID: <20200928184230.2d973291@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2560 bytes --]
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 <sfr@canb•auug.org.au>
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 <sfr@canb•auug.org.au>
---
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-09-28 8:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 8:42 Stephen Rothwell [this message]
2020-09-28 9:10 ` linux-next: build failure after merge of the mhi tree Manivannan Sadhasivam
2020-09-28 9:28 ` Stephen Rothwell
2020-09-28 9:34 ` Kalle Valo
2020-09-28 9:47 ` Manivannan Sadhasivam
2020-09-28 16:45 ` Kalle Valo
2020-09-28 17:04 ` Manivannan Sadhasivam
2020-09-29 6:18 ` Kalle Valo
2020-09-29 15:35 ` Manivannan Sadhasivam
-- strict thread matches above, loose matches on Subject: below --
2022-11-09 4:16 Stephen Rothwell
2022-11-09 7:42 ` Manivannan Sadhasivam
2022-03-02 6:37 Stephen Rothwell
2022-03-02 6:48 ` Manivannan Sadhasivam
2021-08-09 9:38 Stephen Rothwell
2021-08-09 9:55 ` Manivannan Sadhasivam
2020-11-17 4:12 Stephen Rothwell
2020-11-17 4:23 ` Manivannan Sadhasivam
2020-11-17 4:28 ` Manivannan Sadhasivam
2020-11-17 9:15 ` Kalle Valo
2020-11-18 4:39 ` Stephen Rothwell
2020-11-18 4:45 ` Stephen Rothwell
2020-11-18 4:51 ` Stephen Rothwell
2020-11-18 5:06 ` Manivannan Sadhasivam
2020-11-18 9:39 ` Manivannan Sadhasivam
2020-11-18 10:41 ` Stephen Rothwell
2020-08-19 3:48 Stephen Rothwell
2020-08-19 3:49 ` Stephen Rothwell
2020-08-19 4:04 ` Manivannan Sadhasivam
2020-08-19 5:14 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928184230.2d973291@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=davem@davemloft$(echo .)net \
--cc=govinds@codeaurora$(echo .)org \
--cc=kvalo@codeaurora$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=loic.poulain@linaro$(echo .)org \
--cc=manivannan.sadhasivam@linaro$(echo .)org \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox