lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <54D35A76.4010801@linux.intel.com> Date: Thu, 05 Feb 2015 19:56:38 +0800 From: "Fu, Zhonghui" <zhonghui.fu@...ux.intel.com> To: Kalle Valo <kvalo@...eaurora.org> CC: brudley@...adcom.com, Arend van Spriel <arend@...adcom.com>, Franky Lin <frankyl@...adcom.com>, meuleman@...adcom.com, linville@...driver.com, pieterpg@...adcom.com, hdegoede@...hat.com, wens@...e.org, linux-wireless@...r.kernel.org, brcm80211-dev-list@...adcom.com, netdev@...r.kernel.org, "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org> Subject: Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation On 2015/2/3 21:08, Kalle Valo wrote: > "Fu, Zhonghui" <zhonghui.fu@...ux.intel.com> writes: > >> >From ff39ed4af9f1c50358fe92ec4c8eaac9db183e00 Mon Sep 17 00:00:00 2001 >> From: Zhonghui Fu <zhonghui.fu@...ux.intel.com> >> 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@...adcom.com> >> Signed-off-by: Zhonghui Fu <zhonghui.fu@...ux.intel.com> > 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 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