Commit a182a62f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Cross-merge networking fixes after downstream PR (net-6.19-rc9).

No adjacent changes, conflicts:

drivers/net/ethernet/spacemit/k1_emac.c
  3125fc17 ("net: spacemit: k1-emac: fix jumbo frame support")
  f6608679 ("net: spacemit: Remove broken flow control support")
https://lore.kernel.org/aYIysFIE9ooavWia@sirena.org.uk



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a90f6dce 8fdb05de

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com> 
Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <alexander.mikhalitsyn@virtuozzo.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@canonical.com>

Alexander Mikhalitsyn <alexander@mihalicyn.com> <aleksandr.mikhalitsyn@futurfusion.io>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin.ext@nsn.com>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@gmx.de>

Alexander Sverdlin <alexander.sverdlin@gmail.com> <alexander.sverdlin@nokia.com>
@@ -786,7 +787,8 @@ Subash Abhinov Kasiviswanathan <quic_subashab@quicinc.com> <subashab@codeaurora. 
Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>

Subhash Jadavani <subhashj@codeaurora.org>

Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>

Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sudeep Holla <sudeep.holla@kernel.org> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sudeep Holla <sudeep.holla@kernel.org> <sudeep.holla@arm.com>

Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>

Sumit Semwal <sumit.semwal@ti.com>

Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
@@ -851,6 +853,7 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com> 
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>

Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>

Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>

Viacheslav Bocharov <v@baodeep.com> <adeep@lexina.in>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>

Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>

Vincent Mailhol <mailhol@kernel.org> <mailhol.vincent@wanadoo.fr>

Documentation/ABI/testing/sysfs-class-tsm

+0 −10
Original line number Diff line number Diff line
@@ -7,13 +7,3 @@ Description: 
		signals when the PCI layer is able to support establishment of

		link encryption and other device-security features coordinated

		through a platform tsm.
 


What:		/sys/class/tsm/tsmN/streamH.R.E

Contact:	linux-pci@vger.kernel.org

Description:

		(RO) When a host bridge has established a secure connection via

		the platform TSM, symlink appears. The primary function of this

		is have a system global review of TSM resource consumption

		across host bridges. The link points to the endpoint PCI device

		and matches the same link published by the host bridge. See

		Documentation/ABI/testing/sysfs-devices-pci-host-bridge.

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -3472,6 +3472,11 @@ Kernel parameters 
			If there are multiple matching configurations changing

			the same attribute, the last one is used.



	liveupdate=	[KNL,EARLY]

			Format: <bool>

			Enable Live Update Orchestrator (LUO).

			Default: off.



	load_ramdisk=	[RAM] [Deprecated]



	lockd.nlm_grace_period=P  [NFS] Assign grace period.

Documentation/devicetree/bindings/sound/fsl,sai.yaml

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ properties: 
      - items:

          - enum:

              - fsl,imx94-sai

              - fsl,imx952-sai

          - const: fsl,imx95-sai



  reg:

MAINTAINERS

+35 −18
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ F: tools/power/acpi/ 
ACPI FOR ARM64 (ACPI/arm64)

M:	Lorenzo Pieralisi <lpieralisi@kernel.org>

M:	Hanjun Guo <guohanjun@huawei.com>

M:	Sudeep Holla <sudeep.holla@arm.com>

M:	Sudeep Holla <sudeep.holla@kernel.org>

L:	linux-acpi@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -351,7 +351,7 @@ F: drivers/acpi/riscv/ 
F:	include/linux/acpi_rimt.h









ACPI PCC(Platform Communication Channel) MAILBOX DRIVER









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-acpi@vger.kernel.org









S:	Supported









F:	drivers/mailbox/pcc.c








@@ -2747,14 +2747,14 @@ F:	arch/arm/include/asm/hardware/dec21285.h







F:	arch/arm/mach-footbridge/

















ARM/FREESCALE IMX / MXC ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









M:	Sascha Hauer <s.hauer@pengutronix.de>









R:	Pengutronix Kernel Team <kernel@pengutronix.de>









R:	Fabio Estevam <festevam@gmail.com>









L:	imx@lists.linux.dev









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	Documentation/devicetree/bindings/firmware/fsl*









F:	Documentation/devicetree/bindings/firmware/nxp*









F:	arch/arm/boot/dts/nxp/imx/








@@ -2769,22 +2769,22 @@ N:	mxs







N:	\bmxc[^\d]

















ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	arch/arm/boot/dts/nxp/ls/









F:	arch/arm64/boot/dts/freescale/fsl-*









F:	arch/arm64/boot/dts/freescale/qoriq-*

















ARM/FREESCALE VYBRID ARM ARCHITECTURE









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









M:	Sascha Hauer <s.hauer@pengutronix.de>









R:	Pengutronix Kernel Team <kernel@pengutronix.de>









R:	Stefan Agner <stefan@agner.ch>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git









F:	arch/arm/boot/dts/nxp/vf/









F:	arch/arm/mach-imx/*vf610*
















@@ -3681,7 +3681,7 @@ N:	uniphier















ARM/VERSATILE EXPRESS PLATFORM









M:	Liviu Dudau <liviu.dudau@arm.com>









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained








@@ -6514,7 +6514,7 @@ F:	drivers/i2c/busses/i2c-cp2615.c















CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE









M:	Viresh Kumar <viresh.kumar@linaro.org>









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-pm@vger.kernel.org









S:	Maintained









W:	http://www.arm.com/products/processors/technologies/biglittleprocessing.php








@@ -6610,7 +6610,7 @@ F:	include/linux/platform_data/cpuidle-exynos.h















CPUIDLE DRIVER - ARM PSCI









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









M:	Ulf Hansson <ulf.hansson@linaro.org>









L:	linux-pm@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -9819,7 +9819,7 @@ F:	include/uapi/linux/firewire*.h







F:	tools/firewire/

















FIRMWARE FRAMEWORK FOR ARMV8-A









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	drivers/firmware/arm_ffa/








@@ -10517,7 +10517,7 @@ S:	Maintained







F:	scripts/gendwarfksyms/

















GENERIC ARCHITECTURE TOPOLOGY









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	drivers/base/arch_topology.c








@@ -11371,6 +11371,11 @@ F:	Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs







F:	drivers/soc/hisilicon/kunpeng_hccs.c









F:	drivers/soc/hisilicon/kunpeng_hccs.h

















HISILICON SOC HHA DRIVER









M:	Yushan Wang <wangyushan12@huawei.com>









S:	Maintained









F:	drivers/cache/hisi_soc_hha.c

















HISILICON LPC BUS DRIVER









M:	Jay Fang <f.fangjian@huawei.com>









S:	Maintained








@@ -15096,7 +15101,7 @@ F:	drivers/mailbox/arm_mhuv2.c







F:	include/linux/mailbox/arm_mhuv2_message.h

















MAILBOX ARM MHUv3









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









M:	Cristian Marussi <cristian.marussi@arm.com>









L:	linux-kernel@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -20589,7 +20594,7 @@ F:	drivers/pinctrl/pinctrl-amd.c







PIN CONTROLLER - FREESCALE









M:	Dong Aisheng <aisheng.dong@nxp.com>









M:	Fabio Estevam <festevam@gmail.com>









M:	Shawn Guo <shawnguo@kernel.org>









M:	Frank Li <Frank.Li@nxp.com>









M:	Jacky Bai <ping.bai@nxp.com>









R:	Pengutronix Kernel Team <kernel@pengutronix.de>









R:	NXP S32 Linux Team <s32@nxp.com>








@@ -20985,6 +20990,18 @@ F:	Documentation/devicetree/bindings/net/pse-pd/







F:	drivers/net/pse-pd/









F:	net/ethtool/pse-pd.c

















PSP SECURITY PROTOCOL









M:	Daniel Zahka <daniel.zahka@gmail.com>









M:	Jakub Kicinski <kuba@kernel.org>









M:	Willem de Bruijn <willemdebruijn.kernel@gmail.com>









F:	Documentation/netlink/specs/psp.yaml









F:	Documentation/networking/psp.rst









F:	include/net/psp/









F:	include/net/psp.h









F:	include/uapi/linux/psp.h









F:	net/psp/









K:	struct\ psp(_assoc|_dev|hdr)\b

















PSTORE FILESYSTEM









M:	Kees Cook <kees@kernel.org>









R:	Tony Luck <tony.luck@intel.com>








@@ -23644,7 +23661,7 @@ F:	include/uapi/linux/sed*







SECURE MONITOR CALL(SMC) CALLING CONVENTION (SMCCC)









M:	Mark Rutland <mark.rutland@arm.com>









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	drivers/firmware/smccc/








@@ -25408,7 +25425,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git







F:	drivers/mfd/syscon.c

















SYSTEM CONTROL & POWER/MANAGEMENT INTERFACE (SCPI/SCMI) Message Protocol drivers









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









R:	Cristian Marussi <cristian.marussi@arm.com>









L:	arm-scmi@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)








@@ -26560,7 +26577,7 @@ F:	samples/tsm-mr/















TRUSTED SERVICES TEE DRIVER









M:	Balint Dobszay <balint.dobszay@arm.com>









M:	Sudeep Holla <sudeep.holla@arm.com>









M:	Sudeep Holla <sudeep.holla@kernel.org>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	trusted-services@lists.trustedfirmware.org









S:	Maintained