From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH v2 0/5] ath10k: implement beacon offload
Date: Mon, 12 Jan 2015 14:31:54 +0200 [thread overview]
Message-ID: <87d26kdvt1.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1420715550-16017-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Thu, 8 Jan 2015 12:12:25 +0100")
Michal Kazior <michal.kazior@tieto.com> writes:
> Hi,
>
> New wmi-tlv firmware will support beacon/presp
> offloading. This patchset adds appropriate
> support.
>
> These patches of mine were originally posted by
> Bartosz before christmas after I went on my
> holidays.
>
> v2:
> * add a comment in patch 5
>
>
> Michal Kazior (5):
> ath10k: implement new beacon tx status event
> ath10k: implement beacon template command
> ath10k: implement prb tmpl wmi command
> ath10k: implement p2p bcn ie command
> ath10k: implement support for ap beacon offloading
While applying this I had few trivial commits with wmi ops. Can you
double check my resolution from ath-next-test, please? (It might take an
hour before I push the patches.)
Pushing patch "ath10k-implement-new-beacon-tx" ... done
Pushing patch "ath10k-implement-beacon-templa" ...
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h
Error: The merge failed during "push".
Revert the operation with "stg undo".
stg rebase: 3 conflict(s)
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-01-12 12:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-08 11:12 [PATCH v2 0/5] ath10k: implement beacon offload Michal Kazior
2015-01-08 11:12 ` [PATCH v2 1/5] ath10k: implement new beacon tx status event Michal Kazior
2015-01-08 11:12 ` [PATCH v2 2/5] ath10k: implement beacon template command Michal Kazior
2015-01-08 11:12 ` [PATCH v2 3/5] ath10k: implement prb tmpl wmi command Michal Kazior
2015-01-08 11:12 ` [PATCH v2 4/5] ath10k: implement p2p bcn ie command Michal Kazior
2015-01-08 11:12 ` [PATCH v2 5/5] ath10k: implement support for ap beacon offloading Michal Kazior
2015-01-12 12:31 ` Kalle Valo [this message]
2015-01-12 13:26 ` [PATCH v2 0/5] ath10k: implement beacon offload Michal Kazior
2015-01-15 10:32 ` 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=87d26kdvt1.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--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).