From: Kalle Valo <kvalo@codeaurora•org>
To: "Fu\, Zhonghui" <zhonghui.fu@linux•intel.com>
Cc: brudley@broadcom•com, Arend van Spriel <arend@broadcom•com>,
Franky Lin <frankyl@broadcom•com>,
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" <linux-kernel@vger•kernel.org>
Subject: Re: [PATCH] brcmfmac: avoid duplicated suspend/resume operation
Date: Tue, 03 Feb 2015 15:08:07 +0200 [thread overview]
Message-ID: <87vbjjw3bc.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <54C5AA8C.4010005@linux.intel.com> (Zhonghui Fu's message of "Mon, 26 Jan 2015 10:46:36 +0800")
"Fu, Zhonghui" <zhonghui.fu@linux•intel.com> writes:
>>From ff39ed4af9f1c50358fe92ec4c8eaac9db183e00 Mon Sep 17 00:00:00 2001
> From: Zhonghui Fu <zhonghui.fu@linux•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@broadcom•com>
> Signed-off-by: Zhonghui Fu <zhonghui.fu@linux•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.
--
Kalle Valo
next prev parent reply other threads:[~2015-02-03 13:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-26 2:46 [PATCH] brcmfmac: avoid duplicated suspend/resume operation Fu, Zhonghui
2015-02-03 13:08 ` Kalle Valo [this message]
2015-02-05 11:56 ` Fu, Zhonghui
2015-02-05 11:34 ` Fu, Zhonghui
2015-02-05 11:46 ` Arend van Spriel
2015-02-09 4:49 ` Fu, Zhonghui
-- strict thread matches above, loose matches on Subject: below --
2015-01-20 3:31 Fu, Zhonghui
[not found] ` <54BDCC06.8090107-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-01-22 13:49 ` Kalle Valo
[not found] ` <87twzincvz.fsf-HodKDYzPHsUD5k0oWYwrnHL1okKdlPRT@public.gmane.org>
2015-01-22 13:54 ` Sergei Shtylyov
[not found] ` <54C1012F.1020400-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org>
2015-01-22 20:58 ` Arend van Spriel
[not found] ` <54C1646B.4080409-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-01-23 15:29 ` Kalle Valo
2015-01-23 18:09 ` Arend van Spriel
2015-01-27 5:35 ` Fu, Zhonghui
2015-02-02 1:58 ` Fu, Zhonghui
2015-01-12 6:41 Fu, Zhonghui
2015-01-12 10:00 ` Arend van Spriel
[not found] ` <54B39B59.8000907-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>
2015-01-15 12:52 ` Kalle Valo
2015-01-20 3:34 ` Fu, Zhonghui
2015-01-12 14:06 ` Sergei Shtylyov
2015-01-12 16:24 ` Arend van Spriel
2014-12-31 8:20 Fu, Zhonghui
2014-12-31 9:56 ` Arend van Spriel
2015-01-05 2:34 ` Fu, Zhonghui
2015-01-05 10:48 ` Arend van Spriel
2015-01-12 6:43 ` Fu, Zhonghui
2014-12-31 11:22 ` Sergei Shtylyov
2015-01-05 2:37 ` Fu, Zhonghui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87vbjjw3bc.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@codeaurora$(echo .)org \
--cc=arend@broadcom$(echo .)com \
--cc=brcm80211-dev-list@broadcom$(echo .)com \
--cc=brudley@broadcom$(echo .)com \
--cc=frankyl@broadcom$(echo .)com \
--cc=hdegoede@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-wireless@vger$(echo .)kernel.org \
--cc=linville@tuxdriver$(echo .)com \
--cc=meuleman@broadcom$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pieterpg@broadcom$(echo .)com \
--cc=wens@csie$(echo .)org \
--cc=zhonghui.fu@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox