From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: <ath10k@lists.infradead.org>,
Janusz Dziedzic <janusz.dziedzic@tieto.com>,
<linux-wireless@vger.kernel.org>
Subject: Re: [PATCH 1/2] ath10k: implement sta keepalive command
Date: Wed, 28 Jan 2015 10:20:43 +0200 [thread overview]
Message-ID: <87h9vb9uzo.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1421749440-10457-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 20 Jan 2015 11:23:59 +0100")
Michal Kazior <michal.kazior@tieto.com> writes:
> From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
>
> New wmi-tlv firmware for qca6174 has STA keepalive
> service available. The service can provide
> automatic idle connection polling via NullFunc
> frames to AP when acting as a client.
>
> Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
> Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
I had a trivial conflict, please check my resolution from the pending
branch:
Applying: ath10k: implement sta keepalive command
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: implement sta keepalive command
--
Kalle Valo
next prev parent reply other threads:[~2015-01-29 1:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-20 10:23 [PATCH 1/2] ath10k: implement sta keepalive command Michal Kazior
2015-01-20 10:24 ` [PATCH 2/2] ath10k: disable sta keepalive Michal Kazior
2015-01-28 8:20 ` Kalle Valo [this message]
2015-01-28 8:49 ` [PATCH 1/2] ath10k: implement sta keepalive command Michal Kazior
2015-01-29 10:16 ` 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=87h9vb9uzo.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 \
--cc=michal.kazior@tieto.com \
/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;
as well as URLs for NNTP newsgroup(s).