From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:54862 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966198AbdAIUDk (ORCPT ); Mon, 9 Jan 2017 15:03:40 -0500 Date: Mon, 9 Jan 2017 21:04:00 +0100 From: Greg KH To: Kalle Valo Cc: Larry Finger , stable@vger.kernel.org, weiyongjun1@huawei.com Subject: Re: FAILED: patch "[PATCH] rtlwifi: Fix kernel oops introduced with commit e49656147359" failed to apply to 4.9-stable tree Message-ID: <20170109200400.GA12033@kroah.com> References: <148370520425473@kroah.com> <87o9zgz47b.fsf@kamboji.qca.qualcomm.com> <29741a09-dd16-6fd5-3749-fd57db73f2ff@lwfinger.net> <87vatot7al.fsf@kamboji.qca.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87vatot7al.fsf@kamboji.qca.qualcomm.com> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Jan 09, 2017 at 08:30:42PM +0200, Kalle Valo wrote: > Larry Finger writes: > > > On 01/09/2017 08:40 AM, Kalle Valo wrote: > >> writes: > >> > >>> The patch below does not apply to the 4.9-stable tree. > >>> If someone wants it applied there, or to any other stable or longterm > >>> tree, then please email the backport, including the original git commit > >>> id to . > >>> > >>> thanks, > >>> > >>> greg k-h > >>> > >>> ------------------ original commit in Linus's tree ------------------ > >>> > >>> From 22b68b93ae2506bd56ee3bf232a51bc8ab955b56 Mon Sep 17 00:00:00 2001 > >>> From: Larry Finger > >>> Date: Mon, 19 Dec 2016 20:38:12 -0600 > >>> Subject: [PATCH] rtlwifi: Fix kernel oops introduced with commit e49656147359 > >>> > >>> With commit e49656147359 {"rtlwifi: Use dev_kfree_skb_irq instead of > >>> kfree_skb"), the method used to free an skb was changed because the > >>> kfree_skb() was inside a spinlock. What was forgotten is that kfree_skb() > >>> guards against a NULL value for the argument. Routine dev_kfree_skb_irq() > >>> does not, and a test is needed to prevent kernel panics. > >>> > >>> Fixes: e49656147359 ("rtlwifi: Use dev_kfree_skb_irq instead of kfree_skb") > >>> Signed-off-by: Larry Finger > >>> Cc: Stable # 4.9+ > >>> Cc: Wei Yongjun > >>> Signed-off-by: Kalle Valo > >> > >> Larry, are you planning to port this to 4.9? > > > > No. Apparently I got confused again and my use of the Cc to stable was > > incorrect. Commit 49656147359 was not applied until the 4.10 merge. > > The source of the confusion is related to when the various commits > > appear in the git log for mainline. The code, however, has the final > > word. :) > > Ah, ok. I'm actually having similar problems and planning to come up > with a some sort of web page which would show what was the first Linux > release to contain the commit. (git-describe doesn't tell that and AFAIK > there is no other git command to show it.) If only I had more free time :) git describe --contains