]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'mm-nonmm-stable-2025-05-31-15-28' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jun 2025 02:12:53 +0000 (19:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 Jun 2025 02:12:53 +0000 (19:12 -0700)
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
  ...

26 files changed:
1  2 
.mailmap
Documentation/filesystems/relay.rst
MAINTAINERS
arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
arch/x86/kernel/kexec-bzimage64.c
arch/x86/kernel/machine_kexec_64.c
arch/x86/mm/pat/set_memory.c
drivers/gpu/drm/panel/panel-samsung-sofef00.c
fs/bcachefs/util.h
fs/proc/base.c
fs/proc/task_mmu.c
fs/xfs/xfs_zone_gc.c
include/linux/compiler_types.h
include/linux/kexec.h
include/linux/sched.h
include/linux/util_macros.h
init/main.c
kernel/Kconfig.kexec
kernel/Makefile
kernel/exit.c
kernel/kexec_file.c
kernel/panic.c
lib/Kconfig.debug
samples/Kconfig
scripts/checkpatch.pl

diff --cc .mailmap
Simple merge
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
index 25cf61ebd40cb1090122a1fc9a9fbcef2509b186,7ec1fc8b46f9015f943a25b825b9701964650994..0a4b1d4336217e6be5cf9aa1d3c64dcb13216230
  #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 fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/exit.c
Simple merge
index 10a78358257b3acd2cf9db48d665602a8b4fd883,4a88bfc33824abd218067c0f984f0520c69ab031..69fe76fd92334cb76dadf36f1c8f1e28c9d05f07
@@@ -813,17 -752,7 +789,14 @@@ static int kexec_calculate_store_digest
                if (ksegment->kbuf == pi->purgatory_buf)
                        continue;
  
-               ret = crypto_shash_update(desc, ksegment->kbuf,
-                                         ksegment->bufsz);
-               if (ret)
-                       break;
 +              /*
 +               * Skip the segment if ima_segment_index is set and matches
 +               * the current index
 +               */
 +              if (check_ima_segment_index(image, i))
 +                      continue;
 +
+               sha256_update(&state, ksegment->kbuf, ksegment->bufsz);
  
                /*
                 * Assume rest of the buffer is filled with zero and
diff --cc kernel/panic.c
Simple merge
Simple merge
diff --cc samples/Kconfig
Simple merge
Simple merge