Commit 5fa35bd3 authored Aug 01, 2024 by Jakub Kicinski

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

Cross-merge networking fixes after downstream PR.

No conflicts or adjacent changes.

Link: https://patch.msgid.link/20240801131917.34494-1-pabeni@redhat.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 743ff021 183d46ff

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,7 @@ Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
		Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James Clark <james.clark@linaro.org> <james.clark@arm.com>
		James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Documentation/ABI/testing/debugfs-cxl

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,9 +14,10 @@ Description:
		event to its internal Informational Event log, updates the
		Event Status register, and if configured, interrupts the host.
		It is not an error to inject poison into an address that
		already has poison present and no error is returned. The
		inject_poison attribute is only visible for devices supporting
		the capability.
		already has poison present and no error is returned. If the
		device returns 'Inject Poison Limit Reached' an -EBUSY error
		is returned to the user. The inject_poison attribute is only
		visible for devices supporting the capability.


		What: /sys/kernel/debug/memX/clear_poison

Documentation/admin-guide/kernel-parameters.txt

+0 −3

Original line number	Diff line number	Diff line
		@@ -3830,9 +3830,6 @@

		noalign [KNL,ARM]

		noaltinstr [S390,EARLY] Disables alternative instructions
		patching (CPU alternatives feature).

		noapic [SMP,APIC,EARLY] Tells the kernel to not make use of any
		IOAPICs that may be present in the system.

Documentation/arch/riscv/hwprobe.rst

+2 −0

Original line number	Diff line number	Diff line
		@@ -264,3 +264,5 @@ The following keys are defined:

		* :c:macro:`RISCV_HWPROBE_KEY_HIGHEST_VIRT_ADDRESS`: An unsigned long which
		represent the highest userspace virtual address usable.

		* :c:macro:`RISCV_HWPROBE_KEY_TIME_CSR_FREQ`: Frequency (in Hz) of `time CSR`.

Documentation/arch/riscv/vm-layout.rst

+6 −5

Original line number	Diff line number	Diff line
		@@ -47,11 +47,12 @@ RISC-V Linux Kernel SV39
		\| Kernel-space virtual memory, shared between all processes:
		____________________________________________________________\|___________________________________________________________
		\| \| \| \|
		ffffffc6fea00000 \| -228 GB \| ffffffc6feffffff \| 6 MB \| fixmap
		ffffffc6ff000000 \| -228 GB \| ffffffc6ffffffff \| 16 MB \| PCI io
		ffffffc700000000 \| -228 GB \| ffffffc7ffffffff \| 4 GB \| vmemmap
		ffffffc800000000 \| -224 GB \| ffffffd7ffffffff \| 64 GB \| vmalloc/ioremap space
		ffffffd800000000 \| -160 GB \| fffffff6ffffffff \| 124 GB \| direct mapping of all physical memory
		ffffffc4fea00000 \| -236 GB \| ffffffc4feffffff \| 6 MB \| fixmap
		ffffffc4ff000000 \| -236 GB \| ffffffc4ffffffff \| 16 MB \| PCI io
		ffffffc500000000 \| -236 GB \| ffffffc5ffffffff \| 4 GB \| vmemmap
		ffffffc600000000 \| -232 GB \| ffffffd5ffffffff \| 64 GB \| vmalloc/ioremap space
		ffffffd600000000 \| -168 GB \| fffffff5ffffffff \| 128 GB \| direct mapping of all physical memory
		\| \| \| \|
		fffffff700000000 \| -36 GB \| fffffffeffffffff \| 32 GB \| kasan
		__________________\|____________\|__________________\|_________\|____________________________________________________________
		\|