On 4/14/2025 4:10 AM, Lingbo Kong wrote: > i'll resent this patch rebasing the upstream code.:) > > thx a lot! lorenzo. > > /lingbo Yes, it needs to be rebased... Applying: wifi: ath12k: Abort scan before removing link interface to prevent duplicate deletion Using index info to reconstruct a base tree... M drivers/net/wireless/ath/ath12k/mac.c Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath12k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.c Recorded preimage for 'drivers/net/wireless/ath/ath12k/mac.c' error: Failed to merge in the changes. Patch failed at 0001 wifi: ath12k: Abort scan before removing link interface to prevent duplicate deletion
