Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree

From	Kalle Valo <kvalo@qca.qualcomm.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree
Date	2015-12-07 19:00 +0100
Message-ID	<qD8eS-7I5-5@gated-at.bofh.it> (permalink)
References	<qCUvf-7qj-7@gated-at.bofh.it> <qD5Ap-6co-81@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Kalle Valo <kvalo@codeaurora.org> writes:

> Stephen Rothwell <sfr@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 majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the wireless-drivers-next tree with  Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-12-07 04:20 +0100
  Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo <kvalo@codeaurora.org> - 2015-12-07 16:10 +0100
    Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree Kalle Valo <kvalo@qca.qualcomm.com> - 2015-12-07 19:00 +0100

csiph-web