Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Sasha Levin <sashal@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable <stable@vger.kernel.org>
Subject: Re: List of patches to apply to stable releases (5/26)
Date: Mon, 1 Jun 2020 20:45:19 -0700	[thread overview]
Message-ID: <2177ee1f-2603-d570-e80c-902fcab5e989@roeck-us.net> (raw)
In-Reply-To: <20200602033032.GO1407771@sasha-vm>

On 6/1/20 8:30 PM, Sasha Levin wrote:
> On Mon, Jun 01, 2020 at 12:22:54PM -0700, Guenter Roeck wrote:
>> Hi Greg,
>>
>> On Mon, Jun 01, 2020 at 06:58:35PM +0200, Greg Kroah-Hartman wrote:
>>> On Tue, May 26, 2020 at 09:58:28PM -0700, Guenter Roeck wrote:
>>> > Upstream commit 106d45f350c7 ("scsi: zfcp: fix request object use-after-free in send path causing wrong traces")
>>> >   upstream: v5.3-rc1
>>> >     Fixes: d27a7cb91960 ("zfcp: trace on request for open and close of WKA port")
>>> >       in linux-4.4.y: b5752b0db014
>>> >       upstream: v4.9-rc1
>>> >     Affected branches:
>>> >       linux-4.4.y
>>> >       linux-4.9.y
>>> >       linux-4.14.y
>>> >       linux-4.19.y (already applied)
>>>
>>> This patch does not apply on those older branches, do you have a working
>>> backport?
>>
>> I am a bit at loss. Right now my script still tells me:
>>
>> Upstream commit 106d45f350c7 ("scsi: zfcp: fix request object use-after-free in send path causing wrong traces")
>>  upstream: v5.3-rc1
>>    Fixes: d27a7cb91960 ("zfcp: trace on request for open and close of WKA port")
>>      in linux-4.4.y: b5752b0db014
>>      upstream: v4.9-rc1
>>    Affected branches:
>>      linux-4.4.y
>>      linux-4.9.y
>>      linux-4.14.y
>>      linux-4.19.y (already applied)
>>
>> It only does that if the patch cherry-picks cleanly; otherwise it would
>> report conflicts. I checked and made sure that the patch was indeed applied
>> to my test branches for linux-{4.4,4.9,4.14}.y. I re-applied it, just to be
>> sure, with no problems. I also extracted it with git format-patch and
>> applied it with "git am", without issue.
> 
> Same here, so I've queued it up.
> 
>> What do you use to apply patches ?
> 
> *snicker*
> 
> https://i.pinimg.com/originals/ab/8f/f8/ab8ff8a51f1c2a9014cd9cc71c6def0a.png
> 
>> Anyway, my script also tells me:
>>
>> Upstream commit a33a5d2d16cb ("genirq/generic_pending: Do not lose pending affinity update")
>>  upstream: v4.18-rc1
>>    Fixes: 98229aa36caa ("x86/irq: Plug vector cleanup race")
>>      in linux-4.4.y: 996c591227d9
>>      upstream: v4.5-rc2
>>    Affected branches:
>>      linux-4.4.y (queued)
>>      linux-4.9.y (queued)
>>      linux-4.14.y
>>
>> and, indeed, it looks like a33a5d2d16cb is missing in v4.14.y-queue.
> 
> I think that Greg's script didn't like a33a5d2d16cb pointing to the
> wrong "fixes:" commit - 996c591227d9 rather than 98229aa36caa.
> 

Interesting. Makes me wonder how my script found the correct reference.
But then why did his script pick it up for 4.4.y and 4.9.y ?

Guenter

       reply	other threads:[~2020-06-02  3:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200527045828.GA2874@roeck-us.net>
     [not found] ` <20200601165835.GC1037203@kroah.com>
     [not found]   ` <20200601192254.GA31870@roeck-us.net>
     [not found]     ` <20200602033032.GO1407771@sasha-vm>
2020-06-02  3:45       ` Guenter Roeck [this message]
2020-06-02  3:58         ` List of patches to apply to stable releases (5/26) Sasha Levin

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=2177ee1f-2603-d570-e80c-902fcab5e989@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=sashal@kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox