2 Mar
2025
2 Mar
'25
7:56 p.m.
I ran into this same issue this weekend. I tested v4 of the patchset at https://patchwork.kernel.org/project/linux-wireless/list/?series=937821. On 6.13.5 with gentoo's patchset, the conflict I encountered was at https://patchwork.kernel.org/project/linux-wireless/patch/20250226025647.102..., specifically the hunk:
@@ -134,6 +141,7 @@ struct mt792x_vif {
struct mt792x_phy *phy; u16 valid_links; u8 deflink_id; + enum mt792x_mlo_pm_state mlo_pm_state;
struct work_struct csa_work;
The issue is that the mt792x_vif structure has changed significantly between 6.13 and mt76 HEAD, so I had to manually merge the patch myself (which wasn't particularly difficult, but it's worth knowing).