From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH 1/4] ath10k: add WMI support for WOW
Date: Fri, 13 Mar 2015 18:40:44 +0200 [thread overview]
Message-ID: <877fukrgtv.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1425887720-11466-1-git-send-email-janusz.dziedzic@tieto.com> (Janusz Dziedzic's message of "Mon, 9 Mar 2015 08:55:17 +0100")
Janusz Dziedzic <janusz.dziedzic@tieto.com> writes:
> Add WMI support for WOW like enable,
> wakeup events and host wakeup indication.
>
> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
Patch 1 had quite a few conflicts, please check carefully my resolution
in the pending branch.
Applying: ath10k: add WMI support for WOW
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
Auto-merging drivers/net/wireless/ath/ath10k/wmi-ops.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
Failed to merge in the changes.
Patch failed at 0001 ath10k: add WMI support for WOW
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-03-13 16:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-09 7:55 [PATCH 1/4] ath10k: add WMI support for WOW Janusz Dziedzic
2015-03-09 7:55 ` [PATCH 2/4] ath10k: add WOW disconnect/magic-packet support Janusz Dziedzic
2015-03-23 15:01 ` Kalle Valo
2015-03-09 7:55 ` [PATCH 3/4] ath10k: add WMI support for WOW patterns Janusz Dziedzic
2015-03-09 7:55 ` [PATCH 4/4] ath10k: add WOW patterns support Janusz Dziedzic
2015-03-13 16:40 ` Kalle Valo [this message]
2015-03-13 18:56 ` [PATCH 1/4] ath10k: add WMI support for WOW Janusz Dziedzic
2015-03-30 6:21 ` Kalle Valo
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=877fukrgtv.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=janusz.dziedzic@tieto.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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