On Mon, Feb 26, 2024 at 10:20:45PM +0000, Yosry Ahmed wrote: > On Mon, Feb 26, 2024 at 11:30:10AM +0100, gregkh@xxxxxxxxxxxxxxxxxxx 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@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.7.y > > git checkout FETCH_HEAD > > git cherry-pick -x e3b63e966cac0bf78aaa1efede1827a252815a1d > > # <resolve conflicts, build, test, etc.> > > git commit -s > > git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024022610-amino-basically-add3@gregkh' --subject-prefix 'PATCH 6.7.y' HEAD^.. > > First time sending backports to stable. I think I slightly butchered the > 6.1 and 6.6 patches. The first one has an extra `Change-Id` footer and > no additional `Signed-off-by` (although my original one exists), while > the latter has no 6.6.y prefix. I think I got 6.7 right tho :) > > Greg, please let me know if I need to resend the backports for 6.1 > and/or 6.6, and sorry for any inconvenience. Yes, please do, I have no idea what branches any of these are for :( Please give me a hint somehow... thanks, greg k-h
