From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Sep 2022 20:17:33 +0000 (-0700)
Subject: Merge tag 's390-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v6.6.17~6670
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cda9a8486c48f09dabfec0c17ab109e352fe368e;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 's390-6.0-3' of git://git./linux/kernel/git/s390/linux

Pull s390 fixes from Vasily Gorbik:

 - Update defconfigs

 - Fix linker script to align nospec tables correctly to avoid
   potentially unbootable kernel with some config options

 - Fix alignment check in prepare_hugepage_range() for 2GB hugepages to
   avoid BUG in __unmap_hugepage_range() for unaligned mappings later

 - Remove useless hugepage address alignment in hugetlb fault handling

* tag 's390-6.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/hugetlb: fix prepare_hugepage_range() check for 2 GB hugepages
  s390: update defconfigs
  s390: fix nospec table alignments
  s390/mm: remove useless hugepage address alignment
---

cda9a8486c48f09dabfec0c17ab109e352fe368e