On Wed, Sep 20, 2023 at 11:57:19AM +0200, gregkh@xxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxx>. > > 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@xxxxxxxxxxxxxxx>' --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
