]> www.infradead.org Git - users/willy/pagecache.git/commitdiff
Merge tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2025 01:50:53 +0000 (17:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jan 2025 01:50:53 +0000 (17:50 -0800)
Pull non-MM updates from Andrew Morton:
 "Mainly individually changelogged singleton patches. The patch series
  in this pull are:

   - "lib min_heap: Improve min_heap safety, testing, and documentation"
     from Kuan-Wei Chiu provides various tightenings to the min_heap
     library code

   - "xarray: extract __xa_cmpxchg_raw" from Tamir Duberstein preforms
     some cleanup and Rust preparation in the xarray library code

   - "Update reference to include/asm-<arch>" from Geert Uytterhoeven
     fixes pathnames in some code comments

   - "Converge on using secs_to_jiffies()" from Easwar Hariharan uses
     the new secs_to_jiffies() in various places where that is
     appropriate

   - "ocfs2, dlmfs: convert to the new mount API" from Eric Sandeen
     switches two filesystems to the new mount API

   - "Convert ocfs2 to use folios" from Matthew Wilcox does that

   - "Remove get_task_comm() and print task comm directly" from Yafang
     Shao removes now-unneeded calls to get_task_comm() in various
     places

   - "squashfs: reduce memory usage and update docs" from Phillip
     Lougher implements some memory savings in squashfs and performs
     some maintainability work

   - "lib: clarify comparison function requirements" from Kuan-Wei Chiu
     tightens the sort code's behaviour and adds some maintenance work

   - "nilfs2: protect busy buffer heads from being force-cleared" from
     Ryusuke Konishi fixes an issues in nlifs when the fs is presented
     with a corrupted image

   - "nilfs2: fix kernel-doc comments for function return values" from
     Ryusuke Konishi fixes some nilfs kerneldoc

   - "nilfs2: fix issues with rename operations" from Ryusuke Konishi
     addresses some nilfs BUG_ONs which syzbot was able to trigger

   - "minmax.h: Cleanups and minor optimisations" from David Laight does
     some maintenance work on the min/max library code

   - "Fixes and cleanups to xarray" from Kemeng Shi does maintenance
     work on the xarray library code"

* tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (131 commits)
  ocfs2: use str_yes_no() and str_no_yes() helper functions
  include/linux/lz4.h: add some missing macros
  Xarray: use xa_mark_t in xas_squash_marks() to keep code consistent
  Xarray: remove repeat check in xas_squash_marks()
  Xarray: distinguish large entries correctly in xas_split_alloc()
  Xarray: move forward index correctly in xas_pause()
  Xarray: do not return sibling entries from xas_find_marked()
  ipc/util.c: complete the kernel-doc function descriptions
  gcov: clang: use correct function param names
  latencytop: use correct kernel-doc format for func params
  minmax.h: remove some #defines that are only expanded once
  minmax.h: simplify the variants of clamp()
  minmax.h: move all the clamp() definitions after the min/max() ones
  minmax.h: use BUILD_BUG_ON_MSG() for the lo < hi test in clamp()
  minmax.h: reduce the #define expansion of min(), max() and clamp()
  minmax.h: update some comments
  minmax.h: add whitespace around operators and after commas
  nilfs2: do not update mtime of renamed directory that is not moved
  nilfs2: handle errors that nilfs_prepare_chunk() may return
  CREDITS: fix spelling mistake
  ...

38 files changed:
1  2 
.mailmap
CREDITS
MAINTAINERS
arch/m68k/configs/amiga_defconfig
arch/m68k/configs/apollo_defconfig
arch/m68k/configs/atari_defconfig
arch/m68k/configs/bvme6000_defconfig
arch/m68k/configs/hp300_defconfig
arch/m68k/configs/mac_defconfig
arch/m68k/configs/multi_defconfig
arch/m68k/configs/mvme147_defconfig
arch/m68k/configs/mvme16x_defconfig
arch/m68k/configs/q40_defconfig
arch/m68k/configs/sun3_defconfig
arch/m68k/configs/sun3x_defconfig
arch/powerpc/configs/ppc64_defconfig
arch/s390/kernel/topology.c
drivers/accel/habanalabs/common/habanalabs_drv.c
drivers/gpu/drm/i915/display/intel_display_driver.c
drivers/gpu/drm/nouveau/nouveau_drm.c
drivers/gpu/drm/xe/xe_device.c
drivers/scsi/arcmsr/arcmsr_hba.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/lpfc/lpfc_nportdisc.c
drivers/scsi/pm8001/pm8001_init.c
include/linux/min_heap.h
include/linux/sched.h
kernel/fork.c
kernel/kthread.c
kernel/sched/core.c
kernel/sched/stats.h
lib/Kconfig.debug
lib/Makefile
lib/kunit_iov_iter.c
lib/rhashtable.c
mm/kmemleak.c
net/bluetooth/mgmt.c
scripts/checkpatch.pl

diff --cc .mailmap
Simple merge
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1aa0b298c278d402852199800c3efc7df384b93f,62596424a9aa5b4502363a16acb20df31825781d..50ec0c3c758879681a15f6511d58cff3f634393c
@@@ -395,9 -389,8 +395,8 @@@ void intel_display_driver_resume_access
   * Returns %true if the current thread has display HW access, %false
   * otherwise.
   */
 -bool intel_display_driver_check_access(struct drm_i915_private *i915)
 +bool intel_display_driver_check_access(struct intel_display *display)
  {
-       char comm[TASK_COMM_LEN];
        char current_task[TASK_COMM_LEN + 16];
        char allowed_task[TASK_COMM_LEN + 16] = "none";
  
                return true;
  
        snprintf(current_task, sizeof(current_task), "%s[%d]",
-                get_task_comm(comm, current),
-                task_pid_vnr(current));
+                current->comm, task_pid_vnr(current));
  
 -      if (i915->display.access.allowed_task)
 +      if (display->access.allowed_task)
                snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
-                        get_task_comm(comm, display->access.allowed_task),
 -                       i915->display.access.allowed_task->comm,
 -                       task_pid_vnr(i915->display.access.allowed_task));
++                       display->access.allowed_task->comm,
 +                       task_pid_vnr(display->access.allowed_task));
  
 -      drm_dbg_kms(&i915->drm,
 +      drm_dbg_kms(display->drm,
                    "Reject display access from task %s (allowed to %s)\n",
                    current_task, allowed_task);
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile
Simple merge
Simple merge
Simple merge
diff --cc mm/kmemleak.c
Simple merge
Simple merge
Simple merge