From: Sasha Levin <sashal@kernel.org>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
martin.petersen@oracle.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] scsi: ufs: Fix NULL pointer dereference in" failed to apply to 4.4-stable tree
Date: Wed, 28 Aug 2019 00:07:31 -0400 [thread overview]
Message-ID: <20190828040731.GZ5281@sasha-vm> (raw)
In-Reply-To: <20190826132828.GA12281@kroah.com>
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 <gregkh@linuxfoundation.org>
>> 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 <adrian.hunter@intel.com>
>> 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.
--
Thanks,
Sasha
next prev parent reply other threads:[~2019-08-28 4:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-26 8:55 FAILED: patch "[PATCH] scsi: ufs: Fix NULL pointer dereference in" failed to apply to 4.4-stable tree gregkh
2019-08-26 11:49 ` Adrian Hunter
2019-08-26 13:28 ` Greg KH
2019-08-28 4:07 ` Sasha Levin [this message]
2019-08-28 7:30 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190828040731.GZ5281@sasha-vm \
--to=sashal@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=martin.petersen@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.