[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150313173405.GB9934@opentech.at>
Date: Fri, 13 Mar 2015 18:34:05 +0100
From: Nicholas Mc Guire <der.herr@...r.at>
To: Kalle Valo <kvalo@....qualcomm.com>
Cc: Nicholas Mc Guire <hofrat@...dl.org>, netdev@...r.kernel.org,
linux-wireless@...r.kernel.org, linux-kernel@...r.kernel.org,
ath10k@...ts.infradead.org
Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type
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.
thx!
hofrat
--
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