From: Nicholas Mc Guire <der.herr@hofr.at>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: Nicholas Mc Guire <hofrat@osadl.org>,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type
Date: Fri, 13 Mar 2015 18:34:05 +0100 [thread overview]
Message-ID: <20150313173405.GB9934@opentech.at> (raw)
In-Reply-To: <87y4n0q1rq.fsf@kamboji.qca.qualcomm.com>
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.
thx!
hofrat
WARNING: multiple messages have this Message-ID (diff)
From: Nicholas Mc Guire <der.herr-kA1LtwSENNE@public.gmane.org>
To: Kalle Valo <kvalo-A+ZNKFmMK5xy9aJCnZT0Uw@public.gmane.org>
Cc: Nicholas Mc Guire
<hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
ath10k-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type
Date: Fri, 13 Mar 2015 18:34:05 +0100 [thread overview]
Message-ID: <20150313173405.GB9934@opentech.at> (raw)
In-Reply-To: <87y4n0q1rq.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
On Fri, 13 Mar 2015, Kalle Valo wrote:
> Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.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-Q945KHDl0DbYtjvyW6yDsg@public.gmane.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.
thx!
hofrat
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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: Fri, 13 Mar 2015 18:34:05 +0100 [thread overview]
Message-ID: <20150313173405.GB9934@opentech.at> (raw)
In-Reply-To: <87y4n0q1rq.fsf@kamboji.qca.qualcomm.com>
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.
thx!
hofrat
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-03-13 17:34 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-11 17:14 [PATCH] ath10k: match wait_for_completion_timeout return type Nicholas Mc Guire
2015-03-11 17:14 ` Nicholas Mc Guire
2015-03-13 16:51 ` Kalle Valo
2015-03-13 16:51 ` Kalle Valo
2015-03-13 17:34 ` Nicholas Mc Guire [this message]
2015-03-13 17:34 ` Nicholas Mc Guire
2015-03-13 17:34 ` Nicholas Mc Guire
2015-03-16 14:09 ` Kalle Valo
2015-03-16 14:09 ` Kalle Valo
2015-03-16 14:22 ` Nicholas Mc Guire
2015-03-16 14:22 ` Nicholas Mc Guire
2015-04-07 21:18 Will
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=20150313173405.GB9934@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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.