From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Johannes Berg <johannes@sipsolutions•net>
Cc: Kalle Valo <kvalo@kernel•org>, Jeff Johnson <jjohnson@kernel•org>,
Aditya Kumar Singh <aditya.kumar.singh@oss•qualcomm.com>,
Jeff Johnson <jeff.johnson@oss•qualcomm.com>,
Ath10k List <ath10k@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Maharaja Kennadyrajan <maharaja.kennadyrajan@oss•qualcomm.com>,
Miaoqing Pan <miaoqing.pan@oss•qualcomm.com>,
Wireless <linux-wireless@vger•kernel.org>
Subject: Re: linux-next: manual merge of the ath-next tree with the ath tree
Date: Thu, 6 Nov 2025 11:56:36 +1100 [thread overview]
Message-ID: <20251106115636.7ab861b3@canb.auug.org.au> (raw)
In-Reply-To: <20251030113037.1932c6d2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
Hi all,
On Thu, 30 Oct 2025 11:30:37 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the ath-next tree got a conflict in:
>
> drivers/net/wireless/ath/ath12k/mac.c
>
> between commit:
>
> 9222582ec524 ("Revert "wifi: ath12k: Fix missing station power save configuration"")
>
> from the ath tree and commit:
>
> 6917e268c433 ("wifi: ath12k: Defer vdev bring-up until CSA finalize to avoid stale beacon")
>
> from the ath-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/net/wireless/ath/ath12k/mac.c
> index db351c922018,e79d457e3c03..000000000000
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@@ -4209,7 -4286,7 +4267,8 @@@ static void ath12k_mac_bss_info_changed
> {
> struct ath12k_vif *ahvif = arvif->ahvif;
> struct ieee80211_vif *vif = ath12k_ahvif_to_vif(ahvif);
> + struct ieee80211_vif_cfg *vif_cfg = &vif->cfg;
> + struct ath12k_link_vif *tx_arvif;
> struct cfg80211_chan_def def;
> u32 param_id, param_value;
> enum nl80211_band band;
This is now a conflict between the wireless-next tree and the wireless
tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-11-06 0:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-30 0:30 linux-next: manual merge of the ath-next tree with the ath tree Stephen Rothwell
2025-10-30 1:14 ` Jeff Johnson
2025-11-06 0:56 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-08-08 0:43 Stephen Rothwell
2024-08-08 5:13 ` Kalle Valo
2024-08-14 1:00 ` Stephen Rothwell
2024-08-15 14:04 ` Kalle Valo
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=20251106115636.7ab861b3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=aditya.kumar.singh@oss$(echo .)qualcomm.com \
--cc=ath10k@lists$(echo .)infradead.org \
--cc=jeff.johnson@oss$(echo .)qualcomm.com \
--cc=jjohnson@kernel$(echo .)org \
--cc=johannes@sipsolutions$(echo .)net \
--cc=kvalo@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=maharaja.kennadyrajan@oss$(echo .)qualcomm.com \
--cc=miaoqing.pan@oss$(echo .)qualcomm.com \
/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