Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> writes: > Today's linux-next merge of the wireless-drivers-next tree got a > conflict in: > > drivers/net/wireless/ath/ath10k/pci.c > > between commit: > > 6419fdbb6f90 ("ath10k: poll HTT send completion when CE 5 is unused") > > from Linus' tree and commit: > > afb0bf7f530b ("ath10k: add support for pktlog in QCA99X0") > > from the wireless-drivers-next tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). Thanks, the fix looks good to me. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html