Merge branch 'master' into mm-stable

.mailmap

@@ -340,7 +340,8 @@ Lee Jones <[email protected]> <[email protected]>
 Lee Jones <[email protected]> <[email protected]>
 Lee Jones <[email protected]> <[email protected]>
 Lee Jones <[email protected]> <[email protected]>
-Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
+Leonard Crestez <[email protected]> <[email protected]>
+Leonard Crestez <[email protected]> <[email protected]>
 Leonardo Bras <[email protected]> <[email protected]>
 Leonard Göhrs <[email protected]>
 Leonid I Ananiev <[email protected]>
@@ -497,7 +498,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
 Punit Agrawal <[email protected]> <[email protected]>
 Qais Yousef <[email protected]> <[email protected]>
 Qais Yousef <[email protected]> <[email protected]>
-Quentin Monnet <[email protected]> <[email protected]>
+Quentin Monnet <[email protected]> <[email protected]>
+Quentin Monnet <[email protected]> <[email protected]>
 Quentin Perret <[email protected]> <[email protected]>
 Rafael J. Wysocki <[email protected]> <[email protected]>
 Rajeev Nandan <[email protected]> <[email protected]>

Documentation/arch/x86/resctrl.rst

@@ -574,7 +574,7 @@ Memory b/w domain is L3 cache.
  MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...
 
 Memory bandwidth Allocation specified in MiBps
----------------------------------------------
+----------------------------------------------
 
 Memory bandwidth domain is L3 cache.
 ::

Documentation/kbuild/llvm.rst

@@ -178,7 +178,7 @@ yet. Bug reports are always welcome at the issue tracker below!
  - ``LLVM=1``
  * - s390
  - Maintained
- - ``CC=clang``
+ - ``LLVM=1`` (LLVM >= 18.1.0), ``CC=clang`` (LLVM < 18.1.0)
  * - um (User Mode)
  - Maintained
  - ``LLVM=1``

MAINTAINERS

@@ -3942,8 +3942,7 @@ F: kernel/bpf/ringbuf.c
 
 BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
 M: KP Singh <[email protected]>
-R: Florent Revest <[email protected]>
-R: Brendan Jackman <[email protected]>
+R: Matt Bobrowski <[email protected]>
 L: [email protected]
 S: Maintained
 F: Documentation/bpf/prog_lsm.rst
@@ -3968,7 +3967,7 @@ F: kernel/bpf/bpf_lru*
 F: kernel/bpf/cgroup.c
 
 BPF [TOOLING] (bpftool)
-M: Quentin Monnet <[email protected]>
+M: Quentin Monnet <[email protected]>
 L: [email protected]
 S: Maintained
 F: kernel/bpf/disasm.*
@@ -6157,7 +6156,6 @@ DEVICE-MAPPER (LVM)
 M: Alasdair Kergon <[email protected]>
 M: Mike Snitzer <[email protected]>
 M: Mikulas Patocka <[email protected]>
-M: [email protected]
 L: [email protected]
 S: Maintained
 Q: http:https://patchwork.kernel.org/project/dm-devel/list/
@@ -6173,7 +6171,6 @@ F: include/uapi/linux/dm-*.h
 
 DEVICE-MAPPER VDO TARGET
 M: Matthew Sakai <[email protected]>
-M: [email protected]
 L: [email protected]
 S: Maintained
 F: Documentation/admin-guide/device-mapper/vdo*.rst
@@ -7941,6 +7938,7 @@ M: Gao Xiang <[email protected]>
 M: Chao Yu <[email protected]>
 R: Yue Hu <[email protected]>
 R: Jeffle Xu <[email protected]>
+R: Sandeep Dhavale <[email protected]>
 L: [email protected]
 S: Maintained
 W: https://erofs.docs.kernel.org
@@ -9653,17 +9651,23 @@ L: [email protected]
 S: Maintained
 F: drivers/hid/hid-logitech-hidpp.c
 
-HIGH-RESOLUTION TIMERS, CLOCKEVENTS
+HIGH-RESOLUTION TIMERS, TIMER WHEEL, CLOCKEVENTS
+M: Anna-Maria Behnsen <[email protected]>
+M: Frederic Weisbecker <[email protected]>
 M: Thomas Gleixner <[email protected]>
 L: [email protected]
 S: Maintained
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F: Documentation/timers/
 F: include/linux/clockchips.h
 F: include/linux/hrtimer.h
+F: include/linux/timer.h
 F: kernel/time/clockevents.c
 F: kernel/time/hrtimer.c
-F: kernel/time/timer_*.c
+F: kernel/time/timer.c
+F: kernel/time/timer_list.c
+F: kernel/time/timer_migration.*
+F: tools/testing/selftests/timers/
 
 HIGH-SPEED SCC DRIVER FOR AX.25
 L: [email protected]
@@ -13134,6 +13138,7 @@ F: drivers/net/ethernet/marvell/mvpp2/
 
 MARVELL MWIFIEX WIRELESS DRIVER
 M: Brian Norris <[email protected]>
+R: Francesco Dolcini <[email protected]>
 L: [email protected]
 S: Odd Fixes
 F: drivers/net/wireless/marvell/mwifiex/
@@ -15627,9 +15632,10 @@ F: drivers/misc/nsm.c
 F: include/uapi/linux/nsm.h
 
 NOHZ, DYNTICKS SUPPORT
+M: Anna-Maria Behnsen <[email protected]>
 M: Frederic Weisbecker <[email protected]>
-M: Thomas Gleixner <[email protected]>
 M: Ingo Molnar <[email protected]>
+M: Thomas Gleixner <[email protected]>
 L: [email protected]
 S: Maintained
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
@@ -17590,15 +17596,20 @@ F: drivers/pnp/
 F: include/linux/pnp.h
 
 POSIX CLOCKS and TIMERS
+M: Anna-Maria Behnsen <[email protected]>
+M: Frederic Weisbecker <[email protected]>
 M: Thomas Gleixner <[email protected]>
 L: [email protected]
 S: Maintained
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F: fs/timerfd.c
 F: include/linux/time_namespace.h
-F: include/linux/timer*
+F: include/linux/timerfd.h
+F: include/uapi/linux/time.h
+F: include/uapi/linux/timerfd.h
 F: include/trace/events/timer*
-F: kernel/time/*timer*
+F: kernel/time/itimer.c
+F: kernel/time/posix-*
 F: kernel/time/namespace.c
 
 POWER MANAGEMENT CORE
@@ -18645,18 +18656,21 @@ REALTEK WIRELESS DRIVER (rtlwifi family)
 M: Ping-Ke Shih <[email protected]>
 L: [email protected]
 S: Maintained
+T: git https://github.com/pkshih/rtw.git
 F: drivers/net/wireless/realtek/rtlwifi/
 
 REALTEK WIRELESS DRIVER (rtw88)
 M: Ping-Ke Shih <[email protected]>
 L: [email protected]
 S: Maintained
+T: git https://github.com/pkshih/rtw.git
 F: drivers/net/wireless/realtek/rtw88/
 
 REALTEK WIRELESS DRIVER (rtw89)
 M: Ping-Ke Shih <[email protected]>
 L: [email protected]
 S: Maintained
+T: git https://github.com/pkshih/rtw.git
 F: drivers/net/wireless/realtek/rtw89/
 
 REDPINE WIRELESS DRIVER
@@ -18727,13 +18741,24 @@ S: Supported
 F: Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
 F: drivers/i2c/busses/i2c-emev2.c
 
-RENESAS ETHERNET DRIVERS
+RENESAS ETHERNET AVB DRIVER
 R: Sergey Shtylyov <[email protected]>
 L: [email protected]
 L: [email protected]
-F: Documentation/devicetree/bindings/net/renesas,*.yaml
-F: drivers/net/ethernet/renesas/
-F: include/linux/sh_eth.h
+F: Documentation/devicetree/bindings/net/renesas,etheravb.yaml
+F: drivers/net/ethernet/renesas/Kconfig
+F: drivers/net/ethernet/renesas/Makefile
+F: drivers/net/ethernet/renesas/ravb*
+
+RENESAS ETHERNET SWITCH DRIVER
+R: Yoshihiro Shimoda <[email protected]>
+L: [email protected]
+L: [email protected]
+F: Documentation/devicetree/bindings/net/renesas,*ether-switch.yaml
+F: drivers/net/ethernet/renesas/Kconfig
+F: drivers/net/ethernet/renesas/Makefile
+F: drivers/net/ethernet/renesas/rcar_gen4*
+F: drivers/net/ethernet/renesas/rswitch*
 
 RENESAS IDT821034 ASoC CODEC
 M: Herve Codina <[email protected]>
@@ -18843,6 +18868,16 @@ S: Supported
 F: Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
 F: drivers/i2c/busses/i2c-rzv2m.c
 
+RENESAS SUPERH ETHERNET DRIVER
+R: Sergey Shtylyov <[email protected]>
+L: [email protected]
+L: [email protected]
+F: Documentation/devicetree/bindings/net/renesas,ether.yaml
+F: drivers/net/ethernet/renesas/Kconfig
+F: drivers/net/ethernet/renesas/Makefile
+F: drivers/net/ethernet/renesas/sh_eth*
+F: include/linux/sh_eth.h
+
 RENESAS USB PHY DRIVER
 M: Yoshihiro Shimoda <[email protected]>
 L: [email protected]
@@ -19179,12 +19214,14 @@ M: Hin-Tak Leung <[email protected]>
 M: Larry Finger <[email protected]>
 L: [email protected]
 S: Maintained
+T: git https://github.com/pkshih/rtw.git
 F: drivers/net/wireless/realtek/rtl818x/rtl8187/
 
 RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
 M: Jes Sorensen <[email protected]>
 L: [email protected]
 S: Maintained
+T: git https://github.com/pkshih/rtw.git
 F: drivers/net/wireless/realtek/rtl8xxxu/
 
 RTRS TRANSPORT DRIVERS
@@ -22254,13 +22291,20 @@ S: Supported
 T: git git:https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 F: include/linux/clocksource.h
 F: include/linux/time.h
+F: include/linux/timekeeper_internal.h
+F: include/linux/timekeeping.h
 F: include/linux/timex.h
 F: include/uapi/linux/time.h
 F: include/uapi/linux/timex.h
 F: kernel/time/alarmtimer.c
-F: kernel/time/clocksource.c
-F: kernel/time/ntp.c
-F: kernel/time/time*.c
+F: kernel/time/clocksource*
+F: kernel/time/ntp*
+F: kernel/time/time.c
+F: kernel/time/timeconst.bc
+F: kernel/time/timeconv.c
+F: kernel/time/timecounter.c
+F: kernel/time/timekeeping*
+F: kernel/time/time_test.c
 F: tools/testing/selftests/timers/
 
 TIPC NETWORK LAYER

Makefile

@@ -2,7 +2,7 @@
 VERSION = 6
 PATCHLEVEL = 9
 SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*

arch/arm/include/asm/mman.h

@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ASM_MMAN_H__
+#define __ASM_MMAN_H__
+
+#include <asm/system_info.h>
+#include <uapi/asm/mman.h>
+
+static inline bool arch_memory_deny_write_exec_supported(void)
+{
+ return cpu_architecture() >= CPU_ARCH_ARMv6;
+}
+#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
+
+#endif /* __ASM_MMAN_H__ */

arch/arm64/net/bpf_jit_comp.c

@@ -943,7 +943,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
  emit(A64_UXTH(is64, dst, dst), ctx);
  break;
  case 32:
- emit(A64_REV32(is64, dst, dst), ctx);
+ emit(A64_REV32(0, dst, dst), ctx);
  /* upper 32 bits already cleared */
  break;
  case 64:
@@ -1256,7 +1256,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
  } else {
  emit_a64_mov_i(1, tmp, off, ctx);
  if (sign_extend)
- emit(A64_LDRSW(dst, src_adj, off_adj), ctx);
+ emit(A64_LDRSW(dst, src, tmp), ctx);
  else
  emit(A64_LDR32(dst, src, tmp), ctx);
  }

arch/hexagon/kernel/vmlinux.lds.S

@@ -63,6 +63,7 @@ SECTIONS
  STABS_DEBUG
  DWARF_DEBUG
  ELF_DETAILS
+ .hexagon.attributes 0 : { *(.hexagon.attributes) }
 
  DISCARDS
 }

arch/mips/Kconfig

@@ -619,15 +619,6 @@ config MACH_EYEQ5
 
  bool
 
-config FIT_IMAGE_FDT_EPM5
- bool "Include FDT for Mobileye EyeQ5 development platforms"
- depends on MACH_EYEQ5
- default n
- help
- Enable this to include the FDT for the EyeQ5 development platforms
- from Mobileye in the FIT kernel image.
- This requires u-boot on the platform.
-
 config MACH_NINTENDO64
  bool "Nintendo 64 console"
  select CEVT_R4K
@@ -1011,6 +1002,15 @@ config CAVIUM_OCTEON_SOC
 
 endchoice
 
+config FIT_IMAGE_FDT_EPM5
+ bool "Include FDT for Mobileye EyeQ5 development platforms"
+ depends on MACH_EYEQ5
+ default n
+ help
+ Enable this to include the FDT for the EyeQ5 development platforms
+ from Mobileye in the FIT kernel image.
+ This requires u-boot on the platform.
+
 source "arch/mips/alchemy/Kconfig"
 source "arch/mips/ath25/Kconfig"
 source "arch/mips/ath79/Kconfig"

arch/parisc/include/asm/mman.h

@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __ASM_MMAN_H__
+#define __ASM_MMAN_H__
+
+#include <uapi/asm/mman.h>
+
+/* PARISC cannot allow mdwe as it needs writable stacks */
+static inline bool arch_memory_deny_write_exec_supported(void)
+{
+ return false;
+}
+#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
+
+#endif /* __ASM_MMAN_H__ */

arch/riscv/net/bpf_jit_comp64.c

@@ -1463,6 +1463,22 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx,
  if (ret < 0)
  return ret;
 
+ if (insn->src_reg == BPF_PSEUDO_KFUNC_CALL) {
+ const struct btf_func_model *fm;
+ int idx;
+
+ fm = bpf_jit_find_kfunc_model(ctx->prog, insn);
+ if (!fm)
+ return -EINVAL;
+
+ for (idx = 0; idx < fm->nr_args; idx++) {
+ u8 reg = bpf_to_rv_reg(BPF_REG_1 + idx, ctx);
+
+ if (fm->arg_size[idx] == sizeof(int))
+ emit_sextw(reg, reg, ctx);
+ }
+ }
+
  ret = emit_call(addr, fixed_addr, ctx);
  if (ret)
  return ret;