Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:35221 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752561AbcERSv0 (ORCPT ); Wed, 18 May 2016 14:51:26 -0400 MIME-Version: 1.0 In-Reply-To: References: <20160517.151113.367799295750703003.davem@davemloft.net> <1463568714.13625.18.camel@intel.com> <1463575273.13625.23.camel@intel.com> <1463581411.29999.1.camel@intel.com> Date: Wed, 18 May 2016 11:51:25 -0700 Message-ID: (sfid-20160518_205149_488583_5C6D5E2B) Subject: Re: [GIT] Networking From: Linus Torvalds To: "Coelho, Luciano" Cc: "reinoudkoornstra@gmail.com" , "linux-kernel@vger.kernel.org" , linuxwifi , "Berg, Johannes" , "akpm@linux-foundation.org" , "kvalo@codeaurora.org" , "egrumbach@gmail.com" , "netdev@vger.kernel.org" , "davem@davemloft.net" , "linux-wireless@vger.kernel.org" , "Grumbach, Emmanuel" Content-Type: multipart/mixed; boundary=94eb2c11bef032bcb7053322583a Sender: linux-wireless-owner@vger.kernel.org List-ID: --94eb2c11bef032bcb7053322583a Content-Type: text/plain; charset=UTF-8 On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds 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? Linus --94eb2c11bef032bcb7053322583a Content-Type: text/plain; charset=US-ASCII; name="patch.diff" Content-Disposition: attachment; filename="patch.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iod85dxa0 IGRyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMgfCAzICsrLQogMSBm aWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBh L2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4LmMgYi9kcml2ZXJzL25l dC93aXJlbGVzcy9pbnRlbC9pd2x3aWZpL212bS90eC5jCmluZGV4IDg4MDIxMDkxN2E2Zi4uYzUz YWEwZjIyMGUwIDEwMDY0NAotLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9pbnRlbC9pd2x3aWZp L212bS90eC5jCisrKyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2ludGVsL2l3bHdpZmkvbXZtL3R4 LmMKQEAgLTIxMSw2ICsyMTEsNyBAQCB2b2lkIGl3bF9tdm1fc2V0X3R4X2NtZChzdHJ1Y3QgaXds X212bSAqbXZtLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiLAogCQkJc3RydWN0IGl3bF90eF9jbWQgKnR4 X2NtZCwKIAkJCXN0cnVjdCBpZWVlODAyMTFfdHhfaW5mbyAqaW5mbywgdTggc3RhX2lkKQogewor CXN0cnVjdCBpZWVlODAyMTFfdHhfaW5mbyAqc2tiX2luZm8gPSBJRUVFODAyMTFfU0tCX0NCKHNr Yik7CiAJc3RydWN0IGllZWU4MDIxMV9oZHIgKmhkciA9ICh2b2lkICopc2tiLT5kYXRhOwogCV9f bGUxNiBmYyA9IGhkci0+ZnJhbWVfY29udHJvbDsKIAl1MzIgdHhfZmxhZ3MgPSBsZTMyX3RvX2Nw dSh0eF9jbWQtPnR4X2ZsYWdzKTsKQEAgLTI5NCw3ICsyOTUsNyBAQCB2b2lkIGl3bF9tdm1fc2V0 X3R4X2NtZChzdHJ1Y3QgaXdsX212bSAqbXZtLCBzdHJ1Y3Qgc2tfYnVmZiAqc2tiLAogCXR4X2Nt ZC0+dHhfZmxhZ3MgPSBjcHVfdG9fbGUzMih0eF9mbGFncyk7CiAJLyogVG90YWwgIyBieXRlcyB0 byBiZSB0cmFuc21pdHRlZCAqLwogCXR4X2NtZC0+bGVuID0gY3B1X3RvX2xlMTYoKHUxNilza2It PmxlbiArCi0JCSh1aW50cHRyX3QpaW5mby0+ZHJpdmVyX2RhdGFbMF0pOworCQkodWludHB0cl90 KXNrYl9pbmZvLT5kcml2ZXJfZGF0YVswXSk7CiAJdHhfY21kLT5saWZlX3RpbWUgPSBjcHVfdG9f bGUzMihUWF9DTURfTElGRV9USU1FX0lORklOSVRFKTsKIAl0eF9jbWQtPnN0YV9pZCA9IHN0YV9p ZDsKIAo= --94eb2c11bef032bcb7053322583a--