The patch below does not apply to the 5.4-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.4.y git checkout FETCH_HEAD git cherry-pick -x d3882564a77c21eb746ba5364f3fa89b88de3d61 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable@xxxxxxxxxxxxxxx>' --in-reply-to '2024070150-affluent-mayflower-58d3@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^.. Possible dependencies: d3882564a77c ("syscalls: fix compat_sys_io_pgetevents_time64 usage") a845a6cf1dad ("x86/entry/32: Clean up syscall_32.tbl") cab56d3484d4 ("x86/entry: Remove ABI prefixes from functions in syscall tables") 8210efcb1536 ("x86/entry/64: Add __SYSCALL_COMMON()") b5592e5c0d86 ("x86/entry: Remove syscall qualifier support") d3b1b776eefc ("x86/entry/64: Remove ptregs qualifier from syscall table") 2e487c357917 ("x86/entry/64: Split X32 syscall table into its own file") cc42c045af1f ("x86/entry/64: Move sys_ni_syscall stub to common.c") 27dd84fafcd5 ("x86/entry/64: Use syscall wrappers for x32_rt_sigreturn") 83fa805bcbfc ("Merge tag 'threads-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux") thanks, greg k-h ------------------ original commit in Linus's tree ------------------
