Commit 6f7e6393d1ce for kernel

commit 6f7e6393d1ce636bb7ec77a7fe7b77458fddf701
Merge: ca8f421ea0d3 ce9b1c10c3f1
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Feb 10 19:34:26 2026 -0800

    Merge tag 'x86_entry_for_7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

    Pull x86 entry code updates from Dave Hansen:
     "This is entirely composed of a set of long overdue VDSO cleanups. They
      makes the VDSO build much more logical and zap quite a bit of old
      cruft.

      It also results in a coveted net-code-removal diffstat"

    * tag 'x86_entry_for_7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      x86/entry/vdso: Add vdso2c to .gitignore
      x86/entry/vdso32: Omit '.cfi_offset eflags' for LLVM < 16
      MAINTAINERS: Adjust vdso file entry in INTEL SGX
      x86/entry/vdso/selftest: Update location of vgetrandom-chacha.S
      x86/entry/vdso: Fix filtering of vdso compiler flags
      x86/entry/vdso: Update the object paths for "make vdso_install"
      x86/entry/vdso32: When using int $0x80, use it directly
      x86/cpufeature: Replace X86_FEATURE_SYSENTER32 with X86_FEATURE_SYSFAST32
      x86/vdso: Abstract out vdso system call internals
      x86/entry/vdso: Include GNU_PROPERTY and GNU_STACK PHDRs
      x86/entry/vdso32: Remove open-coded DWARF in sigreturn.S
      x86/entry/vdso32: Remove SYSCALL_ENTER_KERNEL macro in sigreturn.S
      x86/entry/vdso32: Don't rely on int80_landing_pad for adjusting ip
      x86/entry/vdso: Refactor the vdso build
      x86/entry/vdso: Move vdso2c to arch/x86/tools
      x86/entry/vdso: Rename vdso_image_* to vdso*_image

diff --cc tools/testing/selftests/vDSO/vgetrandom-chacha.S
index 8c3cbf4dfd6a,10f982157a1f..16f985b089d4
--- a/tools/testing/selftests/vDSO/vgetrandom-chacha.S
+++ b/tools/testing/selftests/vDSO/vgetrandom-chacha.S
@@@ -14,7 -14,7 +14,7 @@@
  #elif defined(__riscv) && __riscv_xlen == 64
  #include "../../../../arch/riscv/kernel/vdso/vgetrandom-chacha.S"
  #elif defined(__s390x__)
 -#include "../../../../arch/s390/kernel/vdso64/vgetrandom-chacha.S"
 +#include "../../../../arch/s390/kernel/vdso/vgetrandom-chacha.S"
  #elif defined(__x86_64__)
- #include "../../../../arch/x86/entry/vdso/vgetrandom-chacha.S"
+ #include "../../../../arch/x86/entry/vdso/vdso64/vgetrandom-chacha.S"
  #endif