From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757012AbbCMQvj (ORCPT ); Fri, 13 Mar 2015 12:51:39 -0400 Received: from wolverine01.qualcomm.com ([199.106.114.254]:4162 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491AbbCMQve (ORCPT ); Fri, 13 Mar 2015 12:51:34 -0400 X-IronPort-AV: E=McAfee;i="5600,1067,7738"; a="108093396" X-IronPort-AV: E=Sophos;i="5.11,395,1422950400"; d="scan'208";a="870489112" From: Kalle Valo To: Nicholas Mc Guire CC: , , , Subject: Re: [PATCH] ath10k: match wait_for_completion_timeout return type References: <1426094076-10134-1-git-send-email-hofrat@osadl.org> Date: Fri, 13 Mar 2015 18:51:21 +0200 In-Reply-To: <1426094076-10134-1-git-send-email-hofrat@osadl.org> (Nicholas Mc Guire's message of "Wed, 11 Mar 2015 13:14:36 -0400") Message-ID: <87y4n0q1rq.fsf@kamboji.qca.qualcomm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01F.na.qualcomm.com (10.85.0.32) To NASANEXM01G.na.qualcomm.com (10.85.0.33) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Nicholas Mc Guire 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 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 -- Kalle Valo