On 4/16/2024 4:28 PM, Kalle Valo wrote: > Baochen Qiang <quic_bqiang@xxxxxxxxxxx> writes: > >>> patch 6 of this series conflicts with: >>> wifi: ath12k: add support to handle beacon miss for WCN7850 >>> >>> So I was not able to take this series into my local verification tree >>> >>> patch 7 of this series conflicts with: >>> wifi: ath12k: fix mac id extraction when MSDU spillover in rx error path >>> >>> So this conflicts with a patch already in the pending branch >>> >>> So FYI at some point you'll need to rebase. >> So I should rebase after these two patches got merged in master branch? > No need to rebase at this time. In the pending branch I was able to fix > the conflict in patch 7. Please check: > > https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=b92086862c7be6e6810eca204052cada50fc0f5f Thanks and LGTM.
