From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Mar 2024 01:03:09 +0000 (-0700)
Subject: Merge tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v6.9-rc1~106
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e5eb28f6d1afebed4bb7d740a797d0390bd3a357;p=linux-block.git

Merge tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git./linux/kernel/git/akpm/mm

Pull non-MM updates from Andrew Morton:

 - Kuan-Wei Chiu has developed the well-named series "lib min_heap: Min
   heap optimizations".

 - Kuan-Wei Chiu has also sped up the library sorting code in the series
   "lib/sort: Optimize the number of swaps and comparisons".

 - Alexey Gladkov has added the ability for code running within an IPC
   namespace to alter its IPC and MQ limits. The series is "Allow to
   change ipc/mq sysctls inside ipc namespace".

 - Geert Uytterhoeven has contributed some dhrystone maintenance work in
   the series "lib: dhry: miscellaneous cleanups".

 - Ryusuke Konishi continues nilfs2 maintenance work in the series

	"nilfs2: eliminate kmap and kmap_atomic calls"
	"nilfs2: fix kernel bug at submit_bh_wbc()"

 - Nathan Chancellor has updated our build tools requirements in the
   series "Bump the minimum supported version of LLVM to 13.0.1".

 - Muhammad Usama Anjum continues with the selftests maintenance work in
   the series "selftests/mm: Improve run_vmtests.sh".

 - Oleg Nesterov has done some maintenance work against the signal code
   in the series "get_signal: minor cleanups and fix".

Plus the usual shower of singleton patches in various parts of the tree.
Please see the individual changelogs for details.

* tag 'mm-nonmm-stable-2024-03-14-09-36' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (77 commits)
  nilfs2: prevent kernel bug at submit_bh_wbc()
  nilfs2: fix failure to detect DAT corruption in btree and direct mappings
  ocfs2: enable ocfs2_listxattr for special files
  ocfs2: remove SLAB_MEM_SPREAD flag usage
  assoc_array: fix the return value in assoc_array_insert_mid_shortcut()
  buildid: use kmap_local_page()
  watchdog/core: remove sysctl handlers from public header
  nilfs2: use div64_ul() instead of do_div()
  mul_u64_u64_div_u64: increase precision by conditionally swapping a and b
  kexec: copy only happens before uchunk goes to zero
  get_signal: don't initialize ksig->info if SIGNAL_GROUP_EXIT/group_exec_task
  get_signal: hide_si_addr_tag_bits: fix the usage of uninitialized ksig
  get_signal: don't abuse ksig->info.si_signo and ksig->sig
  const_structs.checkpatch: add device_type
  Normalise "name (ad@dr)" MODULE_AUTHORs to "name <ad@dr>"
  dyndbg: replace kstrdup() + strchr() with kstrdup_and_replace()
  list: leverage list_is_head() for list_entry_is_head()
  nilfs2: MAINTAINERS: drop unreachable project mirror site
  smp: make __smp_processor_id() 0-argument macro
  fat: fix uninitialized field in nostale filehandles
  ...
---

e5eb28f6d1afebed4bb7d740a797d0390bd3a357
diff --cc Documentation/process/changes.rst
index ca611c9c2d1e,d7306b8cad13..7ef8de58f7f8
--- a/Documentation/process/changes.rst
+++ b/Documentation/process/changes.rst
@@@ -30,8 -30,8 +30,8 @@@ you probably needn't concern yourself w
          Program        Minimal version       Command to check the version
  ====================== ===============  ========================================
  GNU C                  5.1              gcc --version
- Clang/LLVM (optional)  11.0.0           clang --version
+ Clang/LLVM (optional)  13.0.1           clang --version
 -Rust (optional)        1.74.1           rustc --version
 +Rust (optional)        1.76.0           rustc --version
  bindgen (optional)     0.65.1           bindgen --version
  GNU make               3.82             make --version
  bash                   4.2              bash --version
diff --cc arch/riscv/Kconfig
index 1555fa676769,00edc4ff589c..92b1dbf55176
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@@ -313,9 -310,10 +311,9 @@@ config AS_HAS_INS
  	def_bool $(as-instr,.insn r 51$(comma) 0$(comma) 0$(comma) t0$(comma) t0$(comma) zero)
  
  config AS_HAS_OPTION_ARCH
- 	# https://reviews.llvm.org/D123515
+ 	# https://github.com/llvm/llvm-project/commit/9e8ed3403c191ab9c4903e8eeb8f732ff8a43cb4
  	def_bool y
  	depends on $(as-instr, .option arch$(comma) +m)
 -	depends on !$(as-instr, .option arch$(comma) -i)
  
  source "arch/riscv/Kconfig.socs"
  source "arch/riscv/Kconfig.errata"
diff --cc arch/riscv/include/asm/ftrace.h
index 15055f9df4da,cf5b63e789fa..1276d7d9ca8b
--- a/arch/riscv/include/asm/ftrace.h
+++ b/arch/riscv/include/asm/ftrace.h
@@@ -13,24 -13,9 +13,14 @@@
  #endif
  #define HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
  
- /*
-  * Clang prior to 13 had "mcount" instead of "_mcount":
-  * https://reviews.llvm.org/D98881
-  */
- #if defined(CONFIG_CC_IS_GCC) || CONFIG_CLANG_VERSION >= 130000
- #define MCOUNT_NAME _mcount
- #else
- #define MCOUNT_NAME mcount
- #endif
- 
  #define ARCH_SUPPORTS_FTRACE_OPS 1
  #ifndef __ASSEMBLY__
 +
 +extern void *return_address(unsigned int level);
 +
 +#define ftrace_return_address(n) return_address(n)
 +
- void MCOUNT_NAME(void);
+ void _mcount(void);
  static inline unsigned long ftrace_call_adjust(unsigned long addr)
  {
  	return addr;