From: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
To: Kalle Valo <kvalo@qca.qualcomm.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces
Date: Thu, 5 Nov 2015 10:28:00 +0530 [thread overview]
Message-ID: <20151105045754.GA12919@qca.qualcomm.com> (raw)
In-Reply-To: <87h9l1bq7o.fsf@kamboji.qca.qualcomm.com>
On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>
> > This patch set fixes mismatch in peer_assoc complete wmi command for
> > version 10.4 and peer_id configuration for HTT version < 3.4.
> >
> > V2:
> > - Add cover letter
> > - Rename ath10k_mac_need_offchan_tx_work() to
> > ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
> > to the helper and use it in ath10k_htt_tx() while configuring
> > peerid.
> >
> > Vasanthakumar Thiagarajan (3):
> > ath10k: Fix peer assoc complete WMI command for 10.4
> > ath10k: Rename the helper which is used for off-channel tx
> > ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
>
> These had a conflict but you didn't use ath.git as the baseline so I
> can't easily fix them. Please try always to use clean ath.git master
> branch as the baseline for your patches.
>
> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4
Sorry for this. I prepared these patches on ath:master on top of my other pending
patch set. Not sure what went wrong. Ill resend this. Thanks.
Vasanth
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-11-05 4:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-04 12:05 [PATCH V2 0/3] Fix few WMI/HTT interfaces Vasanthakumar Thiagarajan
2015-11-04 12:05 ` [PATCH V2 1/3] ath10k: Fix peer assoc complete WMI command for 10.4 Vasanthakumar Thiagarajan
2015-11-04 12:05 ` [PATCH V2 2/3] ath10k: Rename the helper which is used for off-channel tx Vasanthakumar Thiagarajan
2015-11-04 12:05 ` [PATCH V2 3/3] ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4 Vasanthakumar Thiagarajan
2015-11-04 17:59 ` [PATCH V2 0/3] Fix few WMI/HTT interfaces Kalle Valo
2015-11-05 4:58 ` Vasanthakumar Thiagarajan [this message]
2015-11-05 11:03 ` Kalle Valo
2015-11-06 5:45 ` Vasanthakumar Thiagarajan
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=20151105045754.GA12919@qca.qualcomm.com \
--to=vthiagar@qti.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=kvalo@qca.qualcomm.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