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 v4 0/7] ath10k: add multi-channel support
Date: Mon, 23 Mar 2015 17:41:59 +0200 [thread overview]
Message-ID: <87twxbd8l4.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1426595448-1630-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 17 Mar 2015 12:30:41 +0000")
Michal Kazior <michal.kazior@tieto.com> writes:
> New qca6174 with wmi-tlv firmware supports
> multi-channel operation. To make use of it
> ath10k needs a few changes: implement mac80211's
> chanctx API and rework tx queue control a bit.
3-way merge fails:
Applying: ath10k: allow empty ssid vdev config
Applying: ath10k: implement chanctx API
error: short SHA1 7b3e6ca is ambiguous.
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0002 ath10k: implement chanctx API
And no wonder, 7 chars is just too short SHA1 abbreviation. Is there any
way to make that longer?
Anyway, can you please rebase?
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
prev parent reply other threads:[~2015-03-23 15:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-17 12:30 [PATCH v4 0/7] ath10k: add multi-channel support Michal Kazior
2015-03-17 12:30 ` [PATCH v4 1/7] ath10k: allow empty ssid vdev config Michal Kazior
2015-03-17 12:30 ` [PATCH v4 2/7] ath10k: implement chanctx API Michal Kazior
2015-03-17 12:30 ` [PATCH v4 3/7] ath10k: implement adaptive qcs command Michal Kazior
2015-03-17 12:30 ` [PATCH v4 4/7] ath10k: rework tx queue locking Michal Kazior
2015-03-17 12:30 ` [PATCH v4 5/7] ath10k: implement tx pause wmi event Michal Kazior
2015-03-17 12:30 ` [PATCH v4 6/7] ath10k: enable multi-channel on supported devices Michal Kazior
2015-03-17 12:30 ` [PATCH v4 7/7] ath10k: allocate fw resources for iface combinations Michal Kazior
2015-03-23 15:41 ` Kalle Valo [this message]
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=87twxbd8l4.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