Linux-next conflict between ath-current and ath-next
For linux-next, wireless, and netdev maintainers:
In drivers/net/wireless/ath/ath12k/wifi7/ahb.c function ath12k_wifi7_ahb_probe() there is a conflict between:
ce9d5197d651 wifi: ath12k: ahb: Revert undocumented ABI and dead code in the ath.git ath-current branch
and:
c3bace8584ca wifi: ath12k: add support to load shared firmware on multiPD in the ath.git ath-next branch
The conflict exists because a new line is added next to ones that were reverted:
ab_ahb->scm_auth_enabled = desc->auth_enabled; + ab_ahb->supports_multipd = desc->supports_multipd; - ab_ahb->userpd_id = ath12k_wifi7_ahb_get_userpd_id(ab); + ab_ahb->userpd_id = ATH12K_AHB_USERPD_ID_0; if (!ab_ahb->userpd_id) return -EOPNOTSUPP;
Since multi-PD is not completely supported in ath/main, my resolution is to keep just the ath-current code:
ab_ahb->scm_auth_enabled = desc->auth_enabled; ab_ahb->userpd_id = ATH12K_AHB_USERPD_ID_0; if (!ab_ahb->userpd_id) return -EOPNOTSUPP;
A DT-approved mechanism for determining UserPD IDs is needed for ath-next.
I'm about to send my ath-current PR to Johannes for v7.3-rc4.
/jeff