LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Nicholas Mc Guire <der.herr@hofr.at>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org, ath10k@lists.infradead.org,
Nicholas Mc Guire <hofrat@osadl.org>
Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type
Date: Mon, 16 Mar 2015 15:22:20 +0100 [thread overview]
Message-ID: <20150316142220.GA30229@opentech.at> (raw)
In-Reply-To: <87a8zdowyo.fsf@kamboji.qca.qualcomm.com>
On Mon, 16 Mar 2015, Kalle Valo wrote:
> Nicholas Mc Guire <der.herr@hofr.at> writes:
>
> > On Fri, 13 Mar 2015, Kalle Valo wrote:
> >
> >> Nicholas Mc Guire <hofrat@osadl.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@osadl.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
>
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
prev parent reply other threads:[~2015-03-16 14:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-11 17:14 Nicholas Mc Guire
2015-03-13 16:51 ` Kalle Valo
2015-03-13 17:34 ` Nicholas Mc Guire
2015-03-16 14:09 ` Kalle Valo
2015-03-16 14:22 ` Nicholas Mc Guire [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150316142220.GA30229@opentech.at \
--to=der.herr@hofr.at \
--cc=ath10k@lists.infradead.org \
--cc=hofrat@osadl.org \
--cc=kvalo@qca.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--subject='Re: [PATCH] ath10k: match wait_for_completion_timeout return type' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).