From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Jul 2026 18:38:00 +0000 (-0700)
Subject: Merge tag 's390-7.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v7.2-rc3~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4fb100039e96211609dfc44fb24b9e4a8a0f2f9;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 's390-7.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Fix missing array_index_nospec() call in diag310 memory topology code
   to prevent speculative execution with a user controlled array index

 - Fix get_align_mask() return type to match vm_unmapped_area_info
   align_mask, avoiding possible truncation for future larger masks

 - Remove empty zcrypt CEX2 files left over after CEX2 and CEX3 driver
   removal

 - Add build salt to the vDSO so it gets a unique build id, similar to
   the kernel and modules

* tag 's390-7.2-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: Add build salt to the vDSO
  s390/zcrypt: Remove the empty file
  s390/mm: Fix type mismatch in get_align_mask().
  s390/diag: Add missing array_index_nospec() call to memtop_get_page_count()
---

f4fb100039e96211609dfc44fb24b9e4a8a0f2f9