On Mon, 16 Mar 2015, Kalle Valo wrote: > Nicholas Mc Guire <der.herr@xxxxxxx> writes: > > > On Fri, 13 Mar 2015, Kalle Valo wrote: > > > >> Nicholas Mc Guire <hofrat@xxxxxxxxx> 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@xxxxxxxxx> > >> > >> 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 > no I was using linux-next - will switch to that branch for the ath10k related cleanups (although the one I posted today was the last from the completion fixup in ath10k - a few more in ath9k left). The failure of this patch was though due to a bad fix of a checkpatch warning - I alligned the original code rather than the replacement - updated my procedure so that re-applying the patch is the final check before sending out. thx! hofrat -- 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
