Skip to content

Commit 4e2e361

Browse files
akpm00akpm00
committed
Merge branch 'master' into mm-stable
2 parents 1dd4505 + 39cd87c commit 4e2e361

File tree

403 files changed

+3472
-1890
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+3472
-1890
lines changed

‎.mailmap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ Lee Jones <lee@kernel.org> <joneslee@google.com>
340340
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>
341341
Lee Jones <lee@kernel.org> <lee.jones@linaro.org>
342342
Lee Jones <lee@kernel.org> <lee@ubuntu.com>
343-
Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>
343+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>
344+
Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>
344345
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
345346
Leonard Göhrs <l.goehrs@pengutronix.de>
346347
Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -497,7 +498,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org>
497498
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
498499
Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>
499500
Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>
500-
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
501+
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>
502+
Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>
501503
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
502504
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
503505
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

‎Documentation/arch/x86/resctrl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ Memory b/w domain is L3 cache.
574574
MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...
575575

576576
Memory bandwidth Allocation specified in MiBps
577-
---------------------------------------------
577+
----------------------------------------------
578578

579579
Memory bandwidth domain is L3 cache.
580580
::

‎Documentation/kbuild/llvm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ yet. Bug reports are always welcome at the issue tracker below!
178178
- ``LLVM=1``
179179
* - s390
180180
- Maintained
181-
- ``CC=clang``
181+
- ``LLVM=1`` (LLVM >= 18.1.0), ``CC=clang`` (LLVM < 18.1.0)
182182
* - um (User Mode)
183183
- Maintained
184184
- ``LLVM=1``

‎MAINTAINERS

Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3942,8 +3942,7 @@ F: kernel/bpf/ringbuf.c
39423942

39433943
BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
39443944
M: KP Singh <kpsingh@kernel.org>
3945-
R: Florent Revest <revest@chromium.org>
3946-
R: Brendan Jackman <jackmanb@chromium.org>
3945+
R: Matt Bobrowski <mattbobrowski@google.com>
39473946
L: bpf@vger.kernel.org
39483947
S: Maintained
39493948
F: Documentation/bpf/prog_lsm.rst
@@ -3968,7 +3967,7 @@ F: kernel/bpf/bpf_lru*
39683967
F: kernel/bpf/cgroup.c
39693968

39703969
BPF [TOOLING] (bpftool)
3971-
M: Quentin Monnet <quentin@isovalent.com>
3970+
M: Quentin Monnet <qmo@kernel.org>
39723971
L: bpf@vger.kernel.org
39733972
S: Maintained
39743973
F: kernel/bpf/disasm.*
@@ -6157,7 +6156,6 @@ DEVICE-MAPPER (LVM)
61576156
M: Alasdair Kergon <agk@redhat.com>
61586157
M: Mike Snitzer <snitzer@kernel.org>
61596158
M: Mikulas Patocka <mpatocka@redhat.com>
6160-
M: dm-devel@lists.linux.dev
61616159
L: dm-devel@lists.linux.dev
61626160
S: Maintained
61636161
Q: http://patchwork.kernel.org/project/dm-devel/list/
@@ -6173,7 +6171,6 @@ F: include/uapi/linux/dm-*.h
61736171

61746172
DEVICE-MAPPER VDO TARGET
61756173
M: Matthew Sakai <msakai@redhat.com>
6176-
M: dm-devel@lists.linux.dev
61776174
L: dm-devel@lists.linux.dev
61786175
S: Maintained
61796176
F: Documentation/admin-guide/device-mapper/vdo*.rst
@@ -7941,6 +7938,7 @@ M: Gao Xiang <xiang@kernel.org>
79417938
M: Chao Yu <chao@kernel.org>
79427939
R: Yue Hu <huyue2@coolpad.com>
79437940
R: Jeffle Xu <jefflexu@linux.alibaba.com>
7941+
R: Sandeep Dhavale <dhavale@google.com>
79447942
L: linux-erofs@lists.ozlabs.org
79457943
S: Maintained
79467944
W: https://erofs.docs.kernel.org
@@ -9653,17 +9651,23 @@ L: linux-input@vger.kernel.org
96539651
S: Maintained
96549652
F: drivers/hid/hid-logitech-hidpp.c
96559653

9656-
HIGH-RESOLUTION TIMERS, CLOCKEVENTS
9654+
HIGH-RESOLUTION TIMERS, TIMER WHEEL, CLOCKEVENTS
9655+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
9656+
M: Frederic Weisbecker <frederic@kernel.org>
96579657
M: Thomas Gleixner <tglx@linutronix.de>
96589658
L: linux-kernel@vger.kernel.org
96599659
S: Maintained
96609660
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
96619661
F: Documentation/timers/
96629662
F: include/linux/clockchips.h
96639663
F: include/linux/hrtimer.h
9664+
F: include/linux/timer.h
96649665
F: kernel/time/clockevents.c
96659666
F: kernel/time/hrtimer.c
9666-
F: kernel/time/timer_*.c
9667+
F: kernel/time/timer.c
9668+
F: kernel/time/timer_list.c
9669+
F: kernel/time/timer_migration.*
9670+
F: tools/testing/selftests/timers/
96679671

96689672
HIGH-SPEED SCC DRIVER FOR AX.25
96699673
L: linux-hams@vger.kernel.org
@@ -13134,6 +13138,7 @@ F: drivers/net/ethernet/marvell/mvpp2/
1313413138

1313513139
MARVELL MWIFIEX WIRELESS DRIVER
1313613140
M: Brian Norris <briannorris@chromium.org>
13141+
R: Francesco Dolcini <francesco@dolcini.it>
1313713142
L: linux-wireless@vger.kernel.org
1313813143
S: Odd Fixes
1313913144
F: drivers/net/wireless/marvell/mwifiex/
@@ -15627,9 +15632,10 @@ F: drivers/misc/nsm.c
1562715632
F: include/uapi/linux/nsm.h
1562815633

1562915634
NOHZ, DYNTICKS SUPPORT
15635+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
1563015636
M: Frederic Weisbecker <frederic@kernel.org>
15631-
M: Thomas Gleixner <tglx@linutronix.de>
1563215637
M: Ingo Molnar <mingo@kernel.org>
15638+
M: Thomas Gleixner <tglx@linutronix.de>
1563315639
L: linux-kernel@vger.kernel.org
1563415640
S: Maintained
1563515641
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/nohz
@@ -17590,15 +17596,20 @@ F: drivers/pnp/
1759017596
F: include/linux/pnp.h
1759117597

1759217598
POSIX CLOCKS and TIMERS
17599+
M: Anna-Maria Behnsen <anna-maria@linutronix.de>
17600+
M: Frederic Weisbecker <frederic@kernel.org>
1759317601
M: Thomas Gleixner <tglx@linutronix.de>
1759417602
L: linux-kernel@vger.kernel.org
1759517603
S: Maintained
1759617604
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
1759717605
F: fs/timerfd.c
1759817606
F: include/linux/time_namespace.h
17599-
F: include/linux/timer*
17607+
F: include/linux/timerfd.h
17608+
F: include/uapi/linux/time.h
17609+
F: include/uapi/linux/timerfd.h
1760017610
F: include/trace/events/timer*
17601-
F: kernel/time/*timer*
17611+
F: kernel/time/itimer.c
17612+
F: kernel/time/posix-*
1760217613
F: kernel/time/namespace.c
1760317614

1760417615
POWER MANAGEMENT CORE
@@ -18645,18 +18656,21 @@ REALTEK WIRELESS DRIVER (rtlwifi family)
1864518656
M: Ping-Ke Shih <pkshih@realtek.com>
1864618657
L: linux-wireless@vger.kernel.org
1864718658
S: Maintained
18659+
T: git https://github.com/pkshih/rtw.git
1864818660
F: drivers/net/wireless/realtek/rtlwifi/
1864918661

1865018662
REALTEK WIRELESS DRIVER (rtw88)
1865118663
M: Ping-Ke Shih <pkshih@realtek.com>
1865218664
L: linux-wireless@vger.kernel.org
1865318665
S: Maintained
18666+
T: git https://github.com/pkshih/rtw.git
1865418667
F: drivers/net/wireless/realtek/rtw88/
1865518668

1865618669
REALTEK WIRELESS DRIVER (rtw89)
1865718670
M: Ping-Ke Shih <pkshih@realtek.com>
1865818671
L: linux-wireless@vger.kernel.org
1865918672
S: Maintained
18673+
T: git https://github.com/pkshih/rtw.git
1866018674
F: drivers/net/wireless/realtek/rtw89/
1866118675

1866218676
REDPINE WIRELESS DRIVER
@@ -18727,13 +18741,24 @@ S: Supported
1872718741
F: Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
1872818742
F: drivers/i2c/busses/i2c-emev2.c
1872918743

18730-
RENESAS ETHERNET DRIVERS
18744+
RENESAS ETHERNET AVB DRIVER
1873118745
R: Sergey Shtylyov <s.shtylyov@omp.ru>
1873218746
L: netdev@vger.kernel.org
1873318747
L: linux-renesas-soc@vger.kernel.org
18734-
F: Documentation/devicetree/bindings/net/renesas,*.yaml
18735-
F: drivers/net/ethernet/renesas/
18736-
F: include/linux/sh_eth.h
18748+
F: Documentation/devicetree/bindings/net/renesas,etheravb.yaml
18749+
F: drivers/net/ethernet/renesas/Kconfig
18750+
F: drivers/net/ethernet/renesas/Makefile
18751+
F: drivers/net/ethernet/renesas/ravb*
18752+
18753+
RENESAS ETHERNET SWITCH DRIVER
18754+
R: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
18755+
L: netdev@vger.kernel.org
18756+
L: linux-renesas-soc@vger.kernel.org
18757+
F: Documentation/devicetree/bindings/net/renesas,*ether-switch.yaml
18758+
F: drivers/net/ethernet/renesas/Kconfig
18759+
F: drivers/net/ethernet/renesas/Makefile
18760+
F: drivers/net/ethernet/renesas/rcar_gen4*
18761+
F: drivers/net/ethernet/renesas/rswitch*
1873718762

1873818763
RENESAS IDT821034 ASoC CODEC
1873918764
M: Herve Codina <herve.codina@bootlin.com>
@@ -18843,6 +18868,16 @@ S: Supported
1884318868
F: Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
1884418869
F: drivers/i2c/busses/i2c-rzv2m.c
1884518870

18871+
RENESAS SUPERH ETHERNET DRIVER
18872+
R: Sergey Shtylyov <s.shtylyov@omp.ru>
18873+
L: netdev@vger.kernel.org
18874+
L: linux-renesas-soc@vger.kernel.org
18875+
F: Documentation/devicetree/bindings/net/renesas,ether.yaml
18876+
F: drivers/net/ethernet/renesas/Kconfig
18877+
F: drivers/net/ethernet/renesas/Makefile
18878+
F: drivers/net/ethernet/renesas/sh_eth*
18879+
F: include/linux/sh_eth.h
18880+
1884618881
RENESAS USB PHY DRIVER
1884718882
M: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
1884818883
L: linux-renesas-soc@vger.kernel.org
@@ -19179,12 +19214,14 @@ M: Hin-Tak Leung <hintak.leung@gmail.com>
1917919214
M: Larry Finger <Larry.Finger@lwfinger.net>
1918019215
L: linux-wireless@vger.kernel.org
1918119216
S: Maintained
19217+
T: git https://github.com/pkshih/rtw.git
1918219218
F: drivers/net/wireless/realtek/rtl818x/rtl8187/
1918319219

1918419220
RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
1918519221
M: Jes Sorensen <Jes.Sorensen@gmail.com>
1918619222
L: linux-wireless@vger.kernel.org
1918719223
S: Maintained
19224+
T: git https://github.com/pkshih/rtw.git
1918819225
F: drivers/net/wireless/realtek/rtl8xxxu/
1918919226

1919019227
RTRS TRANSPORT DRIVERS
@@ -22254,13 +22291,20 @@ S: Supported
2225422291
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
2225522292
F: include/linux/clocksource.h
2225622293
F: include/linux/time.h
22294+
F: include/linux/timekeeper_internal.h
22295+
F: include/linux/timekeeping.h
2225722296
F: include/linux/timex.h
2225822297
F: include/uapi/linux/time.h
2225922298
F: include/uapi/linux/timex.h
2226022299
F: kernel/time/alarmtimer.c
22261-
F: kernel/time/clocksource.c
22262-
F: kernel/time/ntp.c
22263-
F: kernel/time/time*.c
22300+
F: kernel/time/clocksource*
22301+
F: kernel/time/ntp*
22302+
F: kernel/time/time.c
22303+
F: kernel/time/timeconst.bc
22304+
F: kernel/time/timeconv.c
22305+
F: kernel/time/timecounter.c
22306+
F: kernel/time/timekeeping*
22307+
F: kernel/time/time_test.c
2226422308
F: tools/testing/selftests/timers/
2226522309

2226622310
TIPC NETWORK LAYER

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 9
44
SUBLEVEL = 0
5-
EXTRAVERSION = -rc1
5+
EXTRAVERSION = -rc2
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎arch/arm/include/asm/mman.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef __ASM_MMAN_H__
3+
#define __ASM_MMAN_H__
4+
5+
#include <asm/system_info.h>
6+
#include <uapi/asm/mman.h>
7+
8+
static inline bool arch_memory_deny_write_exec_supported(void)
9+
{
10+
return cpu_architecture() >= CPU_ARCH_ARMv6;
11+
}
12+
#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
13+
14+
#endif /* __ASM_MMAN_H__ */

‎arch/arm64/net/bpf_jit_comp.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
943943
emit(A64_UXTH(is64, dst, dst), ctx);
944944
break;
945945
case 32:
946-
emit(A64_REV32(is64, dst, dst), ctx);
946+
emit(A64_REV32(0, dst, dst), ctx);
947947
/* upper 32 bits already cleared */
948948
break;
949949
case 64:
@@ -1256,7 +1256,7 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx,
12561256
} else {
12571257
emit_a64_mov_i(1, tmp, off, ctx);
12581258
if (sign_extend)
1259-
emit(A64_LDRSW(dst, src_adj, off_adj), ctx);
1259+
emit(A64_LDRSW(dst, src, tmp), ctx);
12601260
else
12611261
emit(A64_LDR32(dst, src, tmp), ctx);
12621262
}

‎arch/hexagon/kernel/vmlinux.lds.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ SECTIONS
6363
STABS_DEBUG
6464
DWARF_DEBUG
6565
ELF_DETAILS
66+
.hexagon.attributes 0 : { *(.hexagon.attributes) }
6667

6768
DISCARDS
6869
}

‎arch/mips/Kconfig

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -619,15 +619,6 @@ config MACH_EYEQ5
619619

620620
bool
621621

622-
config FIT_IMAGE_FDT_EPM5
623-
bool "Include FDT for Mobileye EyeQ5 development platforms"
624-
depends on MACH_EYEQ5
625-
default n
626-
help
627-
Enable this to include the FDT for the EyeQ5 development platforms
628-
from Mobileye in the FIT kernel image.
629-
This requires u-boot on the platform.
630-
631622
config MACH_NINTENDO64
632623
bool "Nintendo 64 console"
633624
select CEVT_R4K
@@ -1011,6 +1002,15 @@ config CAVIUM_OCTEON_SOC
10111002

10121003
endchoice
10131004

1005+
config FIT_IMAGE_FDT_EPM5
1006+
bool "Include FDT for Mobileye EyeQ5 development platforms"
1007+
depends on MACH_EYEQ5
1008+
default n
1009+
help
1010+
Enable this to include the FDT for the EyeQ5 development platforms
1011+
from Mobileye in the FIT kernel image.
1012+
This requires u-boot on the platform.
1013+
10141014
source "arch/mips/alchemy/Kconfig"
10151015
source "arch/mips/ath25/Kconfig"
10161016
source "arch/mips/ath79/Kconfig"

‎arch/parisc/include/asm/mman.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#ifndef __ASM_MMAN_H__
3+
#define __ASM_MMAN_H__
4+
5+
#include <uapi/asm/mman.h>
6+
7+
/* PARISC cannot allow mdwe as it needs writable stacks */
8+
static inline bool arch_memory_deny_write_exec_supported(void)
9+
{
10+
return false;
11+
}
12+
#define arch_memory_deny_write_exec_supported arch_memory_deny_write_exec_supported
13+
14+
#endif /* __ASM_MMAN_H__ */

0 commit comments

Comments
 (0)