On 4/23/2024 12:10 PM, Kalle Valo wrote: > Jeff Johnson <quic_jjohnson@xxxxxxxxxxx> writes: > >> On 4/22/2024 11:41 AM, Jeff Johnson wrote: >>> On 4/22/2024 8:41 AM, Jeff Johnson wrote: >>>> On 4/22/2024 6:12 AM, Kalle Valo wrote: >>>>> To avoid breaking git bisect I now reshuffled the pending branch so that >>>>> 'wifi: ath12k: fix kernel crash during resume' is before the suspend >>>>> patchset and my plan is to commit the patches in same order. Does this >>>>> make sense for everyone? >>>>> >>>>> I had a simple conflict in ath12k_core_reset() in these commits: >>>>> >>>>> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=052a6a7c74ae4f20a31a632184f4439edcb0f40c >>>>> >>>>> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=6bc740619993535cb64c4dcebb83c66acd506763 >>>>> >>>>> Please check my changes. Looks good to me. >>>>> >>>> These look OK to me. >>>> I'll test the pending branch on my laptop >>> >>> pending branch crashes on my laptop >>> let me bisect >> >> ok, that was user error. >> >> I had updated my workspace on my VM but not on my actual laptop, and the old >> pending branch on my laptop contained the follow patch which I've already >> flagged as bad (and is not present in the current pending branch): >> >> wifi: ath12k: Fix Tx Completion Ring(WBM2SW) Setup Failure >> >> I updated my laptop to: >> 5085843538af (origin/pending, pending) wifi: ath12k: report station mode >> signal strength >> >> And everything in that pending branch works fine, including hotspot. > > Thanks for testing. Unless no objections from Baochen I'll then apply > this fix and the suspend patches. No objection from me, kalle. >