On 2015/2/3 21:08, Kalle Valo wrote: > "Fu, Zhonghui" <[email protected]> writes: > >> >From ff39ed4af9f1c50358fe92ec4c8eaac9db183e00 Mon Sep 17 00:00:00 2001 >> From: Zhonghui Fu <[email protected]> >> 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<[email protected]> >> Signed-off-by: Zhonghui Fu <[email protected]> > 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. Just see your comments, so please ignore my inquiry in last mail. I will re-base this patch again.
Thanks, Zhonghui -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
