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] [thread-next>] [day] [month] [year] [list]
Message-ID: <87a8zdowyo.fsf@kamboji.qca.qualcomm.com>
Date:	Mon, 16 Mar 2015 16:09:35 +0200
From:	Kalle Valo <kvalo@....qualcomm.com>
To:	Nicholas Mc Guire <der.herr@...r.at>
CC:	<netdev@...r.kernel.org>, <linux-wireless@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>, <ath10k@...ts.infradead.org>,
	Nicholas Mc Guire <hofrat@...dl.org>
Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type

Nicholas Mc Guire <der.herr@...r.at> writes:

> On Fri, 13 Mar 2015, Kalle Valo wrote:
>
>> Nicholas Mc Guire <hofrat@...dl.org> writes:
>> 
>> > Return type of wait_for_completion_timeout is unsigned long not int.
>> > An appropriately named unsigned long is added and the assignments fixed up.
>> >
>> > Signed-off-by: Nicholas Mc Guire <hofrat@...dl.org>
>> 
>> Doesn't apply:
>> 
>> Applying: ath10k: match wait_for_completion_timeout return type
>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/mac.c).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 ath10k: match wait_for_completion_timeout return type
>>
> sorry - no idea how I managed that - checking it.
>
> Will fix it up and repost.

Did you use master branch from ath.git repository? ath10k is in quite
active development so if you use something else there's a substantial
risk that the patch will not apply.

https://wireless.wiki.kernel.org/en/users/drivers/ath10k/sources

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ