[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <5c9d3f87-de21-45a8-8bec-9bf95f9e011c@oss.qualcomm.com>
Date: Wed, 21 Jan 2026 15:08:35 -0800
From: Jeff Johnson <jeff.johnson@....qualcomm.com>
To: Mark Brown <broonie@...nel.org>, Greg KH <greg@...ah.com>,
Arnd Bergmann <arnd@...db.de>,
Kiran Venkatappa <quic_kiranv@...cinc.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the char-misc tree
On 1/21/2026 8:10 AM, Mark Brown wrote:
> Hi all,
>
> After merging the char-misc tree, today's linux-next build (arm64
> defconfig) failed like this:
>
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:23:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 23 | .auto_queue = false,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:37:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 37 | .auto_queue = true,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:88:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 88 | .auto_queue = false,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:102:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 102 | .auto_queue = true,
> | ^~~~~~~~~~
>
>
> Caused by commit
>
> 4a9ba211d0264 (bus: mhi: host: Drop the auto_queue support)
>
> interacting with commit
>
> a72027045263f (wifi: ath12k: Modularize driver into common and Wi-Fi 7 specific components)
>
> from the net-next tree. I have applied a fixup:
>
> From 3cf082adcac859e3c68956352688074c2046bba4 Mon Sep 17 00:00:00 2001
> From: Mark Brown <broonie@...nel.org>
> Date: Wed, 21 Jan 2026 15:31:33 +0000
> Subject: [PATCH] bus: mhi: Fix up interaction with net-next tree
>
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:23:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 23 | .auto_queue = false,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:37:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 37 | .auto_queue = true,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:88:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 88 | .auto_queue = false,
> | ^~~~~~~~~~
> /tmp/next/build/drivers/net/wireless/ath/ath12k/wifi7/mhi.c:102:18: error: 'const struct mhi_channel_config' has no member named 'auto_queue'
> 102 | .auto_queue = true,
> | ^~~~~~~~~~
>
> Signed-off-by: Mark Brown <broonie@...nel.org>
> ---
> drivers/net/wireless/ath/ath12k/wifi7/mhi.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath12k/wifi7/mhi.c b/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> index b8d972659314b..988affafcfd1b 100644
> --- a/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> +++ b/drivers/net/wireless/ath/ath12k/wifi7/mhi.c
> @@ -20,7 +20,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_qcn9274[] = {
> .lpm_notify = false,
> .offload_channel = false,
> .doorbell_mode_switch = false,
> - .auto_queue = false,
> },
> {
> .num = 21,
> @@ -34,7 +33,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_qcn9274[] = {
> .lpm_notify = false,
> .offload_channel = false,
> .doorbell_mode_switch = false,
> - .auto_queue = true,
> },
> };
>
> @@ -85,7 +83,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_wcn7850[] = {
> .lpm_notify = false,
> .offload_channel = false,
> .doorbell_mode_switch = false,
> - .auto_queue = false,
> },
> {
> .num = 21,
> @@ -99,7 +96,6 @@ static const struct mhi_channel_config ath12k_wifi7_mhi_channels_wcn7850[] = {
> .lpm_notify = false,
> .offload_channel = false,
> .doorbell_mode_switch = false,
> - .auto_queue = true,
> },
> };
>
Thank you, that is the correct fixup.
/jeff
Powered by blists - more mailing lists