[PATCH V11 0/9] wifi: ath12k: add MU-MIMO and 160 MHz bandwidth support
Pradeep Kumar Chitrapu
quic_pradeepc at quicinc.com
Tue Apr 1 11:22:11 PDT 2025
>> base-commit: f22471c17f5849b2f20e2c56ec9fcd9dd8d5bf28
>
> Sorry, this has been stuck in my backlog, and now it no longer applies.
> Please rebase.
>
> Applying: wifi: ath12k: push HE MU-MIMO params to hardware
> Using index info to reconstruct a base tree...
> M drivers/net/wireless/ath/ath12k/mac.c
> M drivers/net/wireless/ath/ath12k/mac.h
> M drivers/net/wireless/ath/ath12k/wmi.h
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/ath/ath12k/wmi.h
> Auto-merging drivers/net/wireless/ath/ath12k/mac.h
> Auto-merging drivers/net/wireless/ath/ath12k/mac.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.c
> Recorded preimage for 'drivers/net/wireless/ath/ath12k/mac.c'
> error: Failed to merge in the changes.
> Patch failed at 0001 wifi: ath12k: push HE MU-MIMO params to hardware
>
Sure Jeff, Let me rebase and submit v12
More information about the ath12k
mailing list