Return-path: Received: from mail-qk0-f196.google.com ([209.85.220.196]:34124 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753769AbcESIUE (ORCPT ); Thu, 19 May 2016 04:20:04 -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: Thu, 19 May 2016 02:20:03 -0600 Message-ID: (sfid-20160519_102049_555008_BA167645) Subject: Re: [GIT] Networking From: Reinoud Koornstra To: Linus Torvalds Cc: "Coelho, Luciano" , "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: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, May 18, 2016 at 12:51 PM, Linus Torvalds wrote: > 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? 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