Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (56eddc3c) · Commits · git / linux-net

Documentation/arch/arm64/elf_hwcaps.rst

+3 −3

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ HWCAP2_DCPODP
		Functionality implied by ID_AA64ISAR1_EL1.DPB == 0b0010.

		HWCAP2_SVE2
		Functionality implied by ID_AA64ZFR0_EL1.SVEVer == 0b0001.
		Functionality implied by ID_AA64ZFR0_EL1.SVEver == 0b0001.

		HWCAP2_SVEAES
		Functionality implied by ID_AA64ZFR0_EL1.AES == 0b0001.
		@@ -222,7 +222,7 @@ HWCAP2_RNG
		Functionality implied by ID_AA64ISAR0_EL1.RNDR == 0b0001.

		HWCAP2_BTI
		Functionality implied by ID_AA64PFR0_EL1.BT == 0b0001.
		Functionality implied by ID_AA64PFR1_EL1.BT == 0b0001.

		HWCAP2_MTE
		Functionality implied by ID_AA64PFR1_EL1.MTE == 0b0010, as described
		@@ -232,7 +232,7 @@ HWCAP2_ECV
		Functionality implied by ID_AA64MMFR0_EL1.ECV == 0b0001.

		HWCAP2_AFP
		Functionality implied by ID_AA64MFR1_EL1.AFP == 0b0001.
		Functionality implied by ID_AA64MMFR1_EL1.AFP == 0b0001.

		HWCAP2_RPRES
		Functionality implied by ID_AA64ISAR2_EL1.RPRES == 0b0001.

Documentation/arch/riscv/uabi.rst

+20 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,26 @@ An example string following the order is::

		rv64imadc_zifoo_zigoo_zafoo_sbar_scar_zxmbaz_xqux_xrux

		"isa" and "hart isa" lines in /proc/cpuinfo
		-------------------------------------------

		The "isa" line in /proc/cpuinfo describes the lowest common denominator of
		RISC-V ISA extensions recognized by the kernel and implemented on all harts. The
		"hart isa" line, in contrast, describes the set of extensions recognized by the
		kernel on the particular hart being described, even if those extensions may not
		be present on all harts in the system.

		In both lines, the presence of an extension guarantees only that the hardware
		has the described capability. Additional kernel support or policy changes may be
		required before an extension's capability is fully usable by userspace programs.
		Similarly, for S-mode extensions, presence in one of these lines does not
		guarantee that the kernel is taking advantage of the extension, or that the
		feature will be visible in guest VMs managed by this kernel.

		Inversely, the absence of an extension in these lines does not necessarily mean
		the hardware does not support that feature. The running kernel may not recognize
		the extension, or may have deliberately removed it from the listing.

		Misaligned accesses
		-------------------

Documentation/trace/fprobetrace.rst

+6 −2

Original line number	Diff line number	Diff line
		@@ -59,8 +59,12 @@ Synopsis of fprobe-events
		and bitfield are supported.

		(\*1) This is available only when BTF is enabled.
		(\*2) only for the probe on function entry (offs == 0).
		(\*3) only for return probe.
		(\*2) only for the probe on function entry (offs == 0). Note, this argument access
		is best effort, because depending on the argument type, it may be passed on
		the stack. But this only support the arguments via registers.
		(\*3) only for return probe. Note that this is also best effort. Depending on the
		return value type, it might be passed via a pair of registers. But this only
		accesses one register.
		(\*4) this is useful for fetching a field of data structures.
		(\*5) "u" means user-space dereference.

Documentation/trace/kprobetrace.rst

+6 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,12 @@ Synopsis of kprobe_events
		(x8/x16/x32/x64), "char", "string", "ustring", "symbol", "symstr"
		and bitfield are supported.

		(\*1) only for the probe on function entry (offs == 0).
		(\*2) only for return probe.
		(\*1) only for the probe on function entry (offs == 0). Note, this argument access
		is best effort, because depending on the argument type, it may be passed on
		the stack. But this only support the arguments via registers.
		(\*2) only for return probe. Note that this is also best effort. Depending on the
		return value type, it might be passed via a pair of registers. But this only
		accesses one register.
		(\*3) this is useful for fetching a field of data structures.
		(\*4) "u" means user-space dereference. See :ref:`user_mem_access`.

MAINTAINERS

+12 −9

Original line number	Diff line number	Diff line
		@@ -8950,7 +8950,6 @@ S: Maintained
		F: scripts/get_maintainer.pl

		GFS2 FILE SYSTEM
		M: Bob Peterson <rpeterso@redhat.com>
		M: Andreas Gruenbacher <agruenba@redhat.com>
		L: gfs2@lists.linux.dev
		S: Supported
		@@ -21769,7 +21768,9 @@ F: Documentation/devicetree/bindings/counter/ti-eqep.yaml
		F: drivers/counter/ti-eqep.c

		TI ETHERNET SWITCH DRIVER (CPSW)
		R: Grygorii Strashko <grygorii.strashko@ti.com>
		R: Siddharth Vadapalli <s-vadapalli@ti.com>
		R: Ravi Gunasekaran <r-gunasekaran@ti.com>
		R: Roger Quadros <rogerq@kernel.org>
		L: linux-omap@vger.kernel.org
		L: netdev@vger.kernel.org
		S: Maintained
		@@ -21793,6 +21794,15 @@ F: Documentation/devicetree/bindings/media/i2c/ti,ds90*
		F: drivers/media/i2c/ds90*
		F: include/media/i2c/ds90*

		TI ICSSG ETHERNET DRIVER (ICSSG)
		R: MD Danish Anwar <danishanwar@ti.com>
		R: Roger Quadros <rogerq@kernel.org>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		L: netdev@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/net/ti,icss*.yaml
		F: drivers/net/ethernet/ti/icssg/*

		TI J721E CSI2RX DRIVER
		M: Jai Luthra <j-luthra@ti.com>
		L: linux-media@vger.kernel.org
		@@ -23198,13 +23208,6 @@ W: https://linuxtv.org
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/test-drivers/vivid/*

		VLYNQ BUS
		M: Florian Fainelli <f.fainelli@gmail.com>
		L: openwrt-devel@lists.openwrt.org (subscribers-only)
		S: Maintained
		F: drivers/vlynq/vlynq.c
		F: include/linux/vlynq.h

		VM SOCKETS (AF_VSOCK)
		M: Stefano Garzarella <sgarzare@redhat.com>
		L: virtualization@lists.linux.dev