linux-next: manual merge of the ath-next tree with the ath tree

Hi all, Today's linux-next merge of the ath-next tree got a conflict in: drivers/net/wireless/ath/ath12k/hw.c between commit: 38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850") from the ath tree and commit: 8be12629b428 ("wifi: ath12k: restore ASPM f

Re: linux-next: manual merge of the ath-next tree with the ath tree

Stephen Rothwell writes: > Hi all, > > Today's linux-next merge of the ath-next tree got a conflict in: > > drivers/net/wireless/ath/ath12k/hw.c > > between commit: > > 38055789d151 ("wifi: ath12k: use 128 bytes aligned iova in transmit > path for WCN7850") > > from the ath tree and commit: >