"Fu, Zhonghui" <zhonghui.fu@xxxxxxxxxxxxxxx> writes: >>From ff39ed4af9f1c50358fe92ec4c8eaac9db183e00 Mon Sep 17 00:00:00 2001 > From: Zhonghui Fu <zhonghui.fu@xxxxxxxxxxxxxxx> > 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<arend@xxxxxxxxxxxx> > Signed-off-by: Zhonghui Fu <zhonghui.fu@xxxxxxxxxxxxxxx> 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-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
