Michal Kazior <michal.kazior@xxxxxxxxx> 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 -- 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
