[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CA+55aFxTXem=w71Q4pJCgeypqLzt+zk6KqoPM547usNDYxAjpg@mail.gmail.com>
Date: Wed, 18 May 2016 11:51:25 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: "Coelho, Luciano" <luciano.coelho@...el.com>
Cc: "reinoudkoornstra@...il.com" <reinoudkoornstra@...il.com>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
linuxwifi <linuxwifi@...el.com>,
"Berg, Johannes" <johannes.berg@...el.com>,
"akpm@...ux-foundation.org" <akpm@...ux-foundation.org>,
"kvalo@...eaurora.org" <kvalo@...eaurora.org>,
"egrumbach@...il.com" <egrumbach@...il.com>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
"davem@...emloft.net" <davem@...emloft.net>,
"linux-wireless@...r.kernel.org" <linux-wireless@...r.kernel.org>,
"Grumbach, Emmanuel" <emmanuel.grumbach@...el.com>
Subject: Re: [GIT] Networking
On Wed, May 18, 2016 at 11:45 AM, Linus Torvalds
<torvalds@...ux-foundation.org> 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
View attachment "patch.diff" of type "text/plain" (1088 bytes)
Powered by blists - more mailing lists