Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933949AbbBCNIV (ORCPT ); Tue, 3 Feb 2015 08:08:21 -0500 Received: from smtp.codeaurora.org ([198.145.11.231]:33501 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752434AbbBCNIP (ORCPT ); Tue, 3 Feb 2015 08:08:15 -0500 From: Kalle Valo To: "Fu\, Zhonghui" Cc: brudley@broadcom.com, Arend van Spriel , Franky Lin , meuleman@broadcom.com, linville@tuxdriver.com, pieterpg@broadcom.com, hdegoede@redhat.com, wens@csie.org, linux-wireless@vger.kernel.org, brcm80211-dev-list@broadcom.com, netdev@vger.kernel.org, "linux-kernel\@vger.kernel.org" Subject: Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation References: <54C5AA8C.4010005@linux.intel.com> Date: Tue, 03 Feb 2015 15:08:07 +0200 In-Reply-To: <54C5AA8C.4010005@linux.intel.com> (Zhonghui Fu's message of "Mon, 26 Jan 2015 10:46:36 +0800") Message-ID: <87vbjjw3bc.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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1350 Lines: 34 "Fu, Zhonghui" writes: >>From ff39ed4af9f1c50358fe92ec4c8eaac9db183e00 Mon Sep 17 00:00:00 2001 > From: Zhonghui Fu > Date: Mon, 26 Jan 2015 10:13:21 +0800 > Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation > > WiFi chip has 2 SDIO functions, and PM core will trigger > twice suspend/resume operations for one WiFi chip to do > the same things. This patch avoid this case. > > Acked-by: Arend van Spriel > Signed-off-by: Zhonghui Fu This doesn't apply: Applying: brcmfmac: avoid duplicated suspend/resume operation Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c Failed to merge in the changes. Patch failed at 0001 brcmfmac: avoid duplicated suspend/resume operation BTW, when you resend a patch please use "[PATCH v2]" (or v3, v4...) in the Subject field. -- Kalle Valo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/