On 15 January 2015 at 12:10, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: [...] > 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. Looks good, thanks! Michał -- 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
