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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 7 Dec 2015 19:51:35 +0200
From:	Kalle Valo <kvalo@....qualcomm.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	"Vivek Natarajan" <nataraja@....qualcomm.com>,
	Rajkumar Manoharan <rmanohar@....qualcomm.com>,
	<linux-wireless@...r.kernel.org>
Subject: Re: linux-next: manual merge of the wireless-drivers-next tree with Linus' tree

Kalle Valo <kvalo@...eaurora.org> writes:

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