public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <gregkh@linuxfoundation.org>
To: Jens Axboe <axboe@kernel.dk>
Cc: andres@anarazel.de, asml.silence@gmail.com, stable@vger.kernel.org
Subject: Re: FAILED: patch "[PATCH] io_uring: Use io_schedule* in cqring wait" failed to apply to 6.1-stable tree
Date: Mon, 17 Jul 2023 22:12:33 +0200	[thread overview]
Message-ID: <2023071722-quirk-uncouple-9542@gregkh> (raw)
In-Reply-To: <222ae139-33a6-a522-0deb-dcdf044edd19@kernel.dk>

On Mon, Jul 17, 2023 at 10:39:51AM -0600, Jens Axboe wrote:
> On 7/16/23 12:13 PM, Jens Axboe wrote:
> > On 7/16/23 2:41 AM, gregkh@linuxfoundation.org wrote:
> >>
> >> The patch below does not apply to the 6.1-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-6.1.y
> >> git checkout FETCH_HEAD
> >> git cherry-pick -x 8a796565cec3601071cbbd27d6304e202019d014
> >> # <resolve conflicts, build, test, etc.>
> >> git commit -s
> >> git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023071620-litigate-debunk-939a@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> > 
> > Here's one for 6.1-stable.
> 
> And here's a corrected one for 6.1.

All now queued up, thanks.

greg k-h

  parent reply	other threads:[~2023-07-17 20:12 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-16  8:41 FAILED: patch "[PATCH] io_uring: Use io_schedule* in cqring wait" failed to apply to 6.1-stable tree gregkh
2023-07-16 18:13 ` Jens Axboe
2023-07-16 19:11   ` Andres Freund
2023-07-16 19:19     ` Jens Axboe
2023-07-16 19:29       ` Greg KH
2023-07-17 16:32       ` Jens Axboe
2023-07-17 16:39   ` Jens Axboe
2023-07-17 17:33     ` Andres Freund
2023-07-17 20:12     ` Greg KH [this message]
2023-07-17 20:13       ` Jens Axboe

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=2023071722-quirk-uncouple-9542@gregkh \
    --to=gregkh@linuxfoundation.org \
    --cc=andres@anarazel.de \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --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