[PATCH 0/2] ath10k: add wmi-tlv debug event handling

Kalle Valo kvalo at qca.qualcomm.com
Thu Jan 15 03:10:14 PST 2015

Michal Kazior <michal.kazior at tieto.com> writes:

> New wmi-tlv firmware will deliver debug messages
> via new events.
> Note: This may yield some (trivial) conflicts
> against my beacon/presp template patchset.

You were right, but bonus points for having valid parent commit ids for
the 3-way merge! :)

Applying: ath10k: implement diag data container event
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-tlv.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h
Auto-merging drivers/net/wireless/ath/ath10k/wmi-tlv.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c
Failed to merge in the changes.
Patch failed at 0001 ath10k: implement diag data container event

Please double check my conflict resolution in ath-next-test.

Kalle Valo

More information about the ath10k mailing list