From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 404BFC3A5A1 for ; Wed, 28 Aug 2019 07:31:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E8182189D for ; Wed, 28 Aug 2019 07:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726297AbfH1HbR (ORCPT ); Wed, 28 Aug 2019 03:31:17 -0400 Received: from mga01.intel.com ([192.55.52.88]:23814 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726292AbfH1HbR (ORCPT ); Wed, 28 Aug 2019 03:31:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 00:31:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,440,1559545200"; d="scan'208";a="181944132" Received: from ahunter-desktop.fi.intel.com (HELO [10.237.72.66]) ([10.237.72.66]) by fmsmga007.fm.intel.com with ESMTP; 28 Aug 2019 00:31:15 -0700 Subject: Re: FAILED: patch "[PATCH] scsi: ufs: Fix NULL pointer dereference in" failed to apply to 4.4-stable tree To: Sasha Levin , Greg KH Cc: martin.petersen@oracle.com, stable@vger.kernel.org References: <156680972724494@kroah.com> <450beed5-281b-be41-029e-fb98d2ba36ba@intel.com> <20190826132828.GA12281@kroah.com> <20190828040731.GZ5281@sasha-vm> From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Message-ID: <10e26c6d-baa3-5ed4-70b1-eab053340dda@intel.com> Date: Wed, 28 Aug 2019 10:30:11 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190828040731.GZ5281@sasha-vm> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 28/08/19 7:07 AM, Sasha Levin wrote: > On Mon, Aug 26, 2019 at 03:28:28PM +0200, Greg KH wrote: >> On Mon, Aug 26, 2019 at 02:49:49PM +0300, Adrian Hunter wrote: >>> Seems to works for me: >>> >>> $ git log | head -5 >>> commit 5e9f4d704f8698b6d655afa7e9fac3509da253bc >>> Author: Greg Kroah-Hartman >>> Date:   Sun Aug 25 10:53:06 2019 +0200 >>> >>>     Linux 4.4.190 >>> >>> $ git cherry-pick 7c7cfdcf7f1777c7376fc9a239980de04b6b5ea1 >>> warning: inexact rename detection was skipped due to too many files. >>> warning: you may want to set your merge.renamelimit variable to at least >>> 22729 and retry the command. >>> [linux-4.4.y 9558a3c05149] scsi: ufs: Fix NULL pointer dereference in >>> ufshcd_config_vreg_hpm() >>>  Date: Wed Aug 14 15:59:50 2019 +0300 >>>  1 file changed, 3 insertions(+) >>> >>> $ git log | head -5 >>> commit 9558a3c05149ded7136c24325dd3952276fcdaaa >>> Author: Adrian Hunter >>> Date:   Wed Aug 14 15:59:50 2019 +0300 >>> >>>     scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm() >>> >> >> I do not use cherry-pick, I use quilt.  Can you please provide the >> resulting patch that you created here, after you verify that it really >> is correct (see the git warning...) > > Looks like the patched function moved around more than quilt liked. I've > confirmed that what git does is correct and queued it for 4.4. It is not > needed for 4.9, 4.14 and 4.19. Thank you! By the way, regular patch also works: $ patch -p1 < 0001-scsi-ufs-Fix-NULL-pointer-dereference-in-ufshcd_conf.patch patching file drivers/scsi/ufs/ufshcd.c Hunk #1 succeeded at 4418 (offset -2644 lines). So maybe quilt should be made the same?