On Tue, Oct 08, 2024 at 09:29:49AM -0500, Lucas De Marchi wrote: > On Mon, Oct 07, 2024 at 07:45:27PM +0200, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > The patch below does not apply to the 6.11-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-6.11.y > > git checkout FETCH_HEAD > > git cherry-pick -x 74231870cf4976f69e83aa24f48edb16619f652f > > did this change for sending patches to stable? Is this an alternative > only for using --in-reply-to to a failed patch or can > `git cherry-pick -x` be used as alternative to the > "commit 74231870cf4976f69e83aa24f48edb16619f652f upstream." in the body? I'll take either/any/some kind of hint as to what the commit id is. If you want to hand-write it, wonderful, if you want to use git to automatically include it like here, even better, it's your choice. greg k-h