ath10k: merge some more pending upstream fixes