From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 27 May 2025 04:21:12 +0000 (-0700)
Subject: Merge tag 'x86-entry-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: nvme-6.16-2025-06-05~26
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=24244df067c5514ad72b8ad371208b1139dfd0f0;p=nvme.git

Merge tag 'x86-entry-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 vdso updates from Ingo Molnar:
 "Two changes to simplify the x86 vDSO code a bit"

* tag 'x86-entry-2025-05-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vdso: Remove redundant #ifdeffery around in_ia32_syscall()
  x86/vdso: Remove #ifdeffery around page setup variants
---

24244df067c5514ad72b8ad371208b1139dfd0f0