Hi Dave, Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: > Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: > >> Kalle Valo <kvalo@xxxxxxxxxxxxxx> writes: >> >>> git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git tags/wireless-drivers-next-for-davem-2016-05-13 >> >> Please don't pull this yet, there might be something wrong now with >> merges and need to check that first. > > Ok, like discussed in thread "linux-next: manual merge of the > wireless-drivers-next tree with the net-next tree" there seems to be a > problem on net-next in function iwl_mvm_set_tx_cmd(). Here is how I > propose to fix this. I noticed that you had marked this as Superseded in pathwork[1]. I was actually hoping that you would pull this with the instructions how to fix the conflict. But do you actually want me to resubmit the pull request? Or something else? [1] https://patchwork.ozlabs.org/patch/621953/ -- 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
