On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: > On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds > <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote: >> >> From what I can tell, there's a merge bug in commit 909b27f70643, >> where David seems to have lost some of the changes to >> iwl_mvm_set_tx_cmd(). >> >> I do not know if that's the reason for the problem I see. But I will test. > > Yes. The attached patch that fixes the incorrect merge seems to fix > things for me. > > That should mean that the assumption that this problem existed in v4.6 > too was wrong, because the incorrect merge came in later. I think > Luciano mis-understood "v4.6+" to mean plain v4.6. > > Reinoud Koornstra, does this patch fix things for you too? Indeed, I meant 4.6+, not 4.6. The patch you attached doesn't change existing code for me in 4.6+ as these two lines are already in there. Thanks, Reinoud. > > Linus -- 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
