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 <gregkh@xxxxxxxxxxxxxxxxxxx> >>> 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@xxxxxxxxx> >>> 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?
