Kalle Valo <kv...@codeaurora.org> writes:
> Stephen Rothwell <s...@canb.auug.org.au> 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.
BTW, this conflict should be fixed once Dave merges my
wireless-drivers-next pull request.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
