Commit f5837722 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-12-27-15-00' of... 

Merge tag 'mm-hotfixes-stable-2023-12-27-15-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "11 hotfixes. 7 are cc:stable and the other 4 address post-6.6 issues
  or are not considered backporting material"

* tag 'mm-hotfixes-stable-2023-12-27-15-00' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mailmap: add an old address for Naoya Horiguchi
  mm/memory-failure: cast index to loff_t before shifting it
  mm/memory-failure: check the mapcount of the precise page
  mm/memory-failure: pass the folio and the page to collect_procs()
  selftests: secretmem: floor the memory size to the multiple of page_size
  mm: migrate high-order folios in swap cache correctly
  maple_tree: do not preallocate nodes for slot stores
  mm/filemap: avoid buffered read/write race to read inconsistent data
  kunit: kasan_test: disable fortify string checker on kmalloc_oob_memset
  kexec: select CRYPTO from KEXEC_FILE instead of depending on it
  kexec: fix KEXEC_FILE dependencies
parents 1997b3cb 1803d0c5

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -436,6 +436,7 @@ Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org> 
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>

Mythri P K <mythripk@ti.com>

Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>

Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>

Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>

Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>

arch/powerpc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -608,10 +608,10 @@ config ARCH_SUPPORTS_KEXEC 
	def_bool PPC_BOOK3S || PPC_E500 || (44x && !SMP)



config ARCH_SUPPORTS_KEXEC_FILE

	def_bool PPC64 && CRYPTO=y && CRYPTO_SHA256=y

	def_bool PPC64



config ARCH_SUPPORTS_KEXEC_PURGATORY

	def_bool KEXEC_FILE

	def_bool y



config ARCH_SELECTS_KEXEC_FILE

	def_bool y

arch/riscv/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -702,9 +702,7 @@ config ARCH_SELECTS_KEXEC_FILE 
	select KEXEC_ELF



config ARCH_SUPPORTS_KEXEC_PURGATORY

	def_bool KEXEC_FILE

	depends on CRYPTO=y

	depends on CRYPTO_SHA256=y

	def_bool ARCH_SUPPORTS_KEXEC_FILE



config ARCH_SUPPORTS_CRASH_DUMP

	def_bool y

arch/s390/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -254,13 +254,13 @@ config ARCH_SUPPORTS_KEXEC 
	def_bool y



config ARCH_SUPPORTS_KEXEC_FILE

	def_bool CRYPTO && CRYPTO_SHA256 && CRYPTO_SHA256_S390

	def_bool y



config ARCH_SUPPORTS_KEXEC_SIG

	def_bool MODULE_SIG_FORMAT



config ARCH_SUPPORTS_KEXEC_PURGATORY

	def_bool KEXEC_FILE

	def_bool y



config ARCH_SUPPORTS_CRASH_DUMP

	def_bool y

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2072,7 +2072,7 @@ config ARCH_SUPPORTS_KEXEC 
	def_bool y



config ARCH_SUPPORTS_KEXEC_FILE

	def_bool X86_64 && CRYPTO && CRYPTO_SHA256

	def_bool X86_64



config ARCH_SELECTS_KEXEC_FILE

	def_bool y
@@ -2080,7 +2080,7 @@ config ARCH_SELECTS_KEXEC_FILE 
	select HAVE_IMA_KEXEC if IMA



config ARCH_SUPPORTS_KEXEC_PURGATORY

	def_bool KEXEC_FILE

	def_bool y



config ARCH_SUPPORTS_KEXEC_SIG

	def_bool y