Michal Kazior <michal.kazior@xxxxxxxxx> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
