Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Niklas Cassel <Niklas.Cassel@wdc.com>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "chensiying21@gmail.com" <chensiying21@gmail.com>,
	"Chloe_Chen@asmedia.com.tw" <Chloe_Chen@asmedia.com.tw>,
	"dlemoal@kernel.org" <dlemoal@kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: FAILED: patch "[PATCH] ata: libahci: clear pending interrupt status" failed to apply to 4.14-stable tree
Date: Wed, 20 Sep 2023 11:57:25 +0000	[thread overview]
Message-ID: <ZQreIV2lk0OKSuju@x1-carbon> (raw)
In-Reply-To: <2023092019-aptitude-device-3909@gregkh>

On Wed, Sep 20, 2023 at 11:57:19AM +0200, gregkh@linuxfoundation.org wrote:
> 
> The patch below does not apply to the 4.14-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 <stable@vger.kernel.org>.
> 
> To reproduce the conflict and resubmit, you may use the following commands:
> 
> git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y
> git checkout FETCH_HEAD
> git cherry-pick -x 737dd811a3dbfd7edd4ad2ba5152e93d99074f83
> # <resolve conflicts, build, test, etc.>
> git commit -s
> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023092019-aptitude-device-3909@gregkh' --subject-prefix 'PATCH 4.14.y' HEAD^..
> 
> Possible dependencies:
> 
> 737dd811a3db ("ata: libahci: clear pending interrupt status")
> 93c7711494f4 ("ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones")
> 
> thanks,
> 
> greg k-h

Hello Greg,

Seeing that this fix failed to be backported to 4.14, 4.19, 5.4, 5.10 and 5.15,
simply because of a single pointless VPRINTK() call,
may I suggest that we cherry-pick this very small dependency commit:

93c7711494f4 ("ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones")
for all the stable kernels listed above.

After that, the original git commit can be cherry-picked to all stable kernels
listed above without conflicts.


Kind regards,
Niklas

  reply	other threads:[~2023-09-20 11:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-20  9:57 FAILED: patch "[PATCH] ata: libahci: clear pending interrupt status" failed to apply to 4.14-stable tree gregkh
2023-09-20 11:57 ` Niklas Cassel [this message]
2023-09-28 15:46   ` Niklas Cassel

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=ZQreIV2lk0OKSuju@x1-carbon \
    --to=niklas.cassel@wdc.com \
    --cc=Chloe_Chen@asmedia.com.tw \
    --cc=chensiying21@gmail.com \
    --cc=dlemoal@kernel.org \
    --cc=gregkh@linuxfoundation.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