The patch below does not apply to the 5.10-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-5.10.y git checkout FETCH_HEAD git cherry-pick -x 477d81a1c47a1b79b9c08fc92b5dea3c5143800b # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024100139-outfit-agenda-4b7e@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 477d81a1c47a ("x86/entry: Remove unwanted instrumentation in common_interrupt()") 90f357208200 ("x86/idtentry: Incorporate definitions/declarations of the FRED entries") 5b51e1db9bdc ("x86/entry: Convert device interrupts to inline stack switching") 569dd8b4eb7e ("x86/entry: Convert system vectors to irq stack macro") a0cfc74d0b00 ("x86/irq: Provide macro for inlining irq stack switching") 951c2a51ae75 ("x86/irq/64: Adjust the per CPU irq stack pointer by 8") e7f890017971 ("x86/irq: Sanitize irq stack tracking") b6be002bcd1d ("x86/entry: Move nmi entry/exit into common code") thanks, greg k-h ------------------ original commit in Linus's tree ------------------