From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Jan 2025 01:50:53 +0000 (-0800)
Subject: Merge tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.14-rc1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c159dfbdd4fc62fa08f6715d9d6c34d39cf40446;p=thirdparty%2Flinux.git

Merge tag 'mm-nonmm-stable-2025-01-24-23-16' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

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
  ...
---

c159dfbdd4fc62fa08f6715d9d6c34d39cf40446
diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
index 1aa0b298c278d,62596424a9aa5..50ec0c3c75887
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@@ -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";
  
@@@ -406,15 -399,14 +405,14 @@@
  		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);