Peter Oh <poh@xxxxxxxxxxxxxxxx> writes: > Split Mesh service to 11s Mesh and non-11s Mesh according to > firmware service bit to help users distinguish 11s Mesh from > non 11s Mesh. > And add abstraction layer for vdev subtype to solve subtype mismatch > and to give flexible compatibility among different firmware revisions. > > Peter Oh (4): > ath10k: rename Mesh related service names > ath10k: update 10.4 WMI service map > ath10k: use vif->type and vif->p2p for P2P_GO check > ath10k: add abstraction layer for vdev subtype There are conflicts, please rebase. Applying: ath10k: rename Mesh related service names 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 CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h Auto-merging drivers/net/wireless/ath/ath10k/mac.c Failed to merge in the changes. Patch failed at 0001 ath10k: rename Mesh related service names -- 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
