On 23 March 2015 at 11:53, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Marek Puzyniak <marek.puzyniak@xxxxxxxxx> writes: > >> As a part of tdls implementation introduce >> tdls related wmi data structures, constant >> values and functions. >> >> Signed-off-by: Marek Puzyniak <marek.puzyniak@xxxxxxxxx> > > This patch had non-trivial conflicts, please check carefully my > resolution in the pending branch. > > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.h > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-tlv.c > CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi-ops.h > > -- > Kalle Valo It looks OK, but there is one small thing in file drivers/net/wireless/ath/ath10k/wmi-tlv.c. There are two new lines between functions ath10k_wmi_tlv_op_gen_tdls_peer_update and ath10k_wmi_tlv_op_gen_wow_enable. Thanks, Marek -- 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
