Hi Linus,

please pull two small fixes for the 6.16 merge window.

Thanks,
Heiko

The following changes since commit d8cb068359f6210d790828714081d4ccb47014ff:

  Merge tag 's390-6.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux (2025-05-26 14:36:05 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.16-2

for you to fetch changes up to 11709abccf93b08adde95ef313c300b0d4bc28f1:

  s390/mm: Fix in_atomic() handling in do_secure_storage_access() (2025-06-05 12:29:22 +0200)

----------------------------------------------------------------
more s390 updates for 6.16 merge window

- Add missing select CRYPTO_ENGINE to CRYPTO_PAES_S390

- Fix secure storage access exception handling when fault handling is
  disabled

----------------------------------------------------------------
Harald Freudenberger (1):
      s390/crypto: Select crypto engine in Kconfig when PAES is chosen

Heiko Carstens (1):
      s390/mm: Fix in_atomic() handling in do_secure_storage_access()

 arch/s390/mm/fault.c   | 2 ++
 drivers/crypto/Kconfig | 1 +
 2 files changed, 3 insertions(+)

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index da84ff6770de..8b3f6dd00eab 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -442,6 +442,8 @@ void do_secure_storage_access(struct pt_regs *regs)
 		if (rc)
 			BUG();
 	} else {
+		if (faulthandler_disabled())
+			return handle_fault_error_nolock(regs, 0);
 		mm = current->mm;
 		mmap_read_lock(mm);
 		vma = find_vma(mm, addr);
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 5686369779be..9f8a3a5bed7e 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -180,6 +180,7 @@ config CRYPTO_PAES_S390
 	depends on PKEY
 	select CRYPTO_ALGAPI
 	select CRYPTO_SKCIPHER
+	select CRYPTO_ENGINE
 	help
 	  This is the s390 hardware accelerated implementation of the
 	  AES cipher algorithms for use with protected key.

The pull request you sent on Fri, 6 Jun 2025 17:29:46 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-6.16-2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d94467aed34e5ac9cf26d6178a324eed7367e98c

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html