On Tue, Feb 13, 2024 at 07:44:12AM -0700, Jens Axboe wrote:
On 2/13/24 6:19 AM, gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 6.7-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.7.y git checkout FETCH_HEAD git cherry-pick -x 76b367a2d83163cf19173d5cb0b562acbabc8eac # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024021328-washboard-crevice-aaa0@gregkh' --subject-prefix 'PATCH 6.7.y' HEAD^..
Possible dependencies:
76b367a2d831 ("io_uring/net: limit inline multishot retries") 91e5d765a82f ("io_uring/net: un-indent mshot retry path in io_recv_finish()")
This has a number of dependencies, as listed in the commit. You need all three to make this both apply cleanly, and work. Here's the series for 6.7, I'll send the same for the other ones separately.
I tried applying the dependencies, but they didn't all apply either :(
Thanks for all the backports, I'll go queue them up.
greg k-h