From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 1 Jun 2025 02:12:53 +0000 (-0700)
Subject: Merge tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.16-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d4e49a77d9930c69751b9192448fda6ff9100f1;p=thirdparty%2Flinux.git

Merge tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull non-MM updates from Andrew Morton:

 - "hung_task: extend blocking task stacktrace dump to semaphore" from
   Lance Yang enhances the hung task detector.

   The detector presently dumps the blocking tasks's stack when it is
   blocked on a mutex. Lance's series extends this to semaphores

 - "nilfs2: improve sanity checks in dirty state propagation" from
   Wentao Liang addresses a couple of minor flaws in nilfs2

 - "scripts/gdb: Fixes related to lx_per_cpu()" from Illia Ostapyshyn
   fixes a couple of issues in the gdb scripts

 - "Support kdump with LUKS encryption by reusing LUKS volume keys" from
   Coiby Xu addresses a usability problem with kdump.

   When the dump device is LUKS-encrypted, the kdump kernel may not have
   the keys to the encrypted filesystem. A full writeup of this is in
   the series [0/N] cover letter

 - "sysfs: add counters for lockups and stalls" from Max Kellermann adds
   /sys/kernel/hardlockup_count and /sys/kernel/hardlockup_count and
   /sys/kernel/rcu_stall_count

 - "fork: Page operation cleanups in the fork code" from Pasha Tatashin
   implements a number of code cleanups in fork.c

 - "scripts/gdb/symbols: determine KASLR offset on s390 during early
   boot" from Ilya Leoshkevich fixes some s390 issues in the gdb
   scripts

* tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (67 commits)
  llist: make llist_add_batch() a static inline
  delayacct: remove redundant code and adjust indentation
  squashfs: add optional full compressed block caching
  crash_dump, nvme: select CONFIGFS_FS as built-in
  scripts/gdb/symbols: determine KASLR offset on s390 during early boot
  scripts/gdb/symbols: factor out pagination_off()
  scripts/gdb/symbols: factor out get_vmlinux()
  kernel/panic.c: format kernel-doc comments
  mailmap: update and consolidate Casey Connolly's name and email
  nilfs2: remove wbc->for_reclaim handling
  fork: define a local GFP_VMAP_STACK
  fork: check charging success before zeroing stack
  fork: clean-up naming of vm_stack/vm_struct variables in vmap stacks code
  fork: clean-up ifdef logic around stack allocation
  kernel/rcu/tree_stall: add /sys/kernel/rcu_stall_count
  kernel/watchdog: add /sys/kernel/{hard,soft}lockup_count
  x86/crash: make the page that stores the dm crypt keys inaccessible
  x86/crash: pass dm crypt keys to kdump kernel
  Revert "x86/mm: Remove unused __set_memory_prot()"
  crash_dump: retrieve dm crypt keys in kdump kernel
  ...
---

7d4e49a77d9930c69751b9192448fda6ff9100f1
diff --cc fs/bcachefs/util.h
index 25cf61ebd40cb,7ec1fc8b46f90..0a4b1d4336217
--- a/fs/bcachefs/util.h
+++ b/fs/bcachefs/util.h
@@@ -14,9 -14,9 +14,10 @@@
  #include <linux/log2.h>
  #include <linux/percpu.h>
  #include <linux/preempt.h>
 +#include <linux/random.h>
  #include <linux/ratelimit.h>
  #include <linux/slab.h>
+ #include <linux/sort.h>
  #include <linux/vmalloc.h>
  #include <linux/workqueue.h>
  
diff --cc kernel/kexec_file.c
index 10a78358257b3,4a88bfc33824a..69fe76fd92334
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@@ -813,17 -752,7 +789,14 @@@ static int kexec_calculate_store_digest
  		if (ksegment->kbuf == pi->purgatory_buf)
  			continue;
  
 +		/*
 +		 * Skip the segment if ima_segment_index is set and matches
 +		 * the current index
 +		 */
 +		if (check_ima_segment_index(image, i))
 +			continue;
 +
- 		ret = crypto_shash_update(desc, ksegment->kbuf,
- 					  ksegment->bufsz);
- 		if (ret)
- 			break;
+ 		sha256_update(&state, ksegment->kbuf, ksegment->bufsz);
  
  		/*
  		 * Assume rest of the buffer is filled with zero and