Brian Norris <briannorris@xxxxxxxxxxxx> wrote: > ath10k_wcn3990_clk_info and ath10k_wcn3990_vreg_info are not > WCN3990-specific structures. They hold generic data. So don't name them > with wcn3990 specifics. > > Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx> > Reviewed-by: Douglas Anderson <dianders@xxxxxxxxxxxx> > Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx> This patchset (I think it was with the first patch, but not sure) had some conflicts but 3-way merge was able to automatically solve them. Please check the end result anyway: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=77adda81e264e0c93af9570ac4ada82a5d0f5d99 -- https://patchwork.kernel.org/patch/10639795/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches