Commit a103e5ad authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 6.9-rc2 into staging-next 



We need the staging fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 20952655 39cd87c4

.mailmap

+4 −2
Original line number Diff line number Diff line
@@ -340,7 +340,8 @@ Lee Jones <lee@kernel.org> <joneslee@google.com> 
Lee Jones <lee@kernel.org> <lee.jones@canonical.com>

Lee Jones <lee@kernel.org> <lee.jones@linaro.org>

Lee Jones <lee@kernel.org> <lee@ubuntu.com>

Leonard Crestez <leonard.crestez@nxp.com> Leonard Crestez <cdleonard@gmail.com>

Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@nxp.com>

Leonard Crestez <cdleonard@gmail.com> <leonard.crestez@intel.com>

Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>

Leonard Göhrs <l.goehrs@pengutronix.de>

Leonid I Ananiev <leonid.i.ananiev@intel.com>
@@ -497,7 +498,8 @@ Prasad Sodagudi <quic_psodagud@quicinc.com> <psodagud@codeaurora.org> 
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@imgtec.com>

Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com>

Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Documentation/arch/x86/resctrl.rst

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+61 −17
Original line number Diff line number Diff line
@@ -3942,8 +3942,7 @@ F: kernel/bpf/ringbuf.c 








BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)









M:	KP Singh <kpsingh@kernel.org>









R:	Florent Revest <revest@chromium.org>









R:	Brendan Jackman <jackmanb@chromium.org>









R:	Matt Bobrowski <mattbobrowski@google.com>









L:	bpf@vger.kernel.org









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 <quentin@isovalent.com>









M:	Quentin Monnet <qmo@kernel.org>









L:	bpf@vger.kernel.org









S:	Maintained









F:	kernel/bpf/disasm.*








@@ -6157,7 +6156,6 @@ DEVICE-MAPPER  (LVM)







M:	Alasdair Kergon <agk@redhat.com>









M:	Mike Snitzer <snitzer@kernel.org>









M:	Mikulas Patocka <mpatocka@redhat.com>









M:	dm-devel@lists.linux.dev









L:	dm-devel@lists.linux.dev









S:	Maintained









Q:	http://patchwork.kernel.org/project/dm-devel/list/








@@ -6173,7 +6171,6 @@ F:	include/uapi/linux/dm-*.h















DEVICE-MAPPER VDO TARGET









M:	Matthew Sakai <msakai@redhat.com>









M:	dm-devel@lists.linux.dev









L:	dm-devel@lists.linux.dev









S:	Maintained









F:	Documentation/admin-guide/device-mapper/vdo*.rst








@@ -7941,6 +7938,7 @@ M:	Gao Xiang <xiang@kernel.org>







M:	Chao Yu <chao@kernel.org>









R:	Yue Hu <huyue2@coolpad.com>









R:	Jeffle Xu <jefflexu@linux.alibaba.com>









R:	Sandeep Dhavale <dhavale@google.com>









L:	linux-erofs@lists.ozlabs.org









S:	Maintained









W:	https://erofs.docs.kernel.org








@@ -9653,7 +9651,9 @@ L:	linux-input@vger.kernel.org







S:	Maintained









F:	drivers/hid/hid-logitech-hidpp.c

















HIGH-RESOLUTION TIMERS, CLOCKEVENTS









HIGH-RESOLUTION TIMERS, TIMER WHEEL, CLOCKEVENTS









M:	Anna-Maria Behnsen <anna-maria@linutronix.de>









M:	Frederic Weisbecker <frederic@kernel.org>









M:	Thomas Gleixner <tglx@linutronix.de>









L:	linux-kernel@vger.kernel.org









S:	Maintained








@@ -9661,9 +9661,13 @@ T:	git git://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:	linux-hams@vger.kernel.org








@@ -13134,6 +13138,7 @@ F:	drivers/net/ethernet/marvell/mvpp2/















MARVELL MWIFIEX WIRELESS DRIVER









M:	Brian Norris <briannorris@chromium.org>









R:	Francesco Dolcini <francesco@dolcini.it>









L:	linux-wireless@vger.kernel.org









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 <anna-maria@linutronix.de>









M:	Frederic Weisbecker <frederic@kernel.org>









M:	Thomas Gleixner <tglx@linutronix.de>









M:	Ingo Molnar <mingo@kernel.org>









M:	Thomas Gleixner <tglx@linutronix.de>









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://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 <anna-maria@linutronix.de>









M:	Frederic Weisbecker <frederic@kernel.org>









M:	Thomas Gleixner <tglx@linutronix.de>









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://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 <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtw88/

















REALTEK WIRELESS DRIVER (rtw89)









M:	Ping-Ke Shih <pkshih@realtek.com>









L:	linux-wireless@vger.kernel.org









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 <s.shtylyov@omp.ru>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









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 <yoshihiro.shimoda.uh@renesas.com>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









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 <herve.codina@bootlin.com>








@@ -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 <s.shtylyov@omp.ru>









L:	netdev@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









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 <yoshihiro.shimoda.uh@renesas.com>









L:	linux-renesas-soc@vger.kernel.org








@@ -19179,12 +19214,14 @@ M:	Hin-Tak Leung <hintak.leung@gmail.com>







M:	Larry Finger <Larry.Finger@lwfinger.net>









L:	linux-wireless@vger.kernel.org









S:	Maintained









T:	git https://github.com/pkshih/rtw.git









F:	drivers/net/wireless/realtek/rtl818x/rtl8187/

















RTL8XXXU WIRELESS DRIVER (rtl8xxxu)









M:	Jes Sorensen <Jes.Sorensen@gmail.com>









L:	linux-wireless@vger.kernel.org









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://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



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 9









SUBLEVEL = 0









EXTRAVERSION = -rc1









EXTRAVERSION = -rc2









NAME = Hurr durr I'ma ninja sloth



















# *DOCUMENTATION*