Commit 0fe2f273 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Conflicts:

drivers/net/can/dev.c
  commit 03f16c50 ("can: dev: can_restart: fix use after free bug")
  commit 3e77f70e ("can: dev: move driver related infrastructure into separate subdir")

  Code move.

drivers/net/dsa/b53/b53_common.c
 commit 8e4052c3 ("net: dsa: b53: fix an off by one in checking "vlan->vid"")
 commit b7a9e0da ("net: switchdev: remove vid_begin -> vid_end range from VLAN objects")

 Field rename.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7b8fc010 75439bc4

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>

Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -5972,6 +5972,10 @@ 
			This option is obsoleted by the "nopv" option, which

			has equivalent effect for XEN platform.



	xen_no_vector_callback

			[KNL,X86,XEN] Disable the vector callback for Xen

			event channel interrupts.



	xen_scrub_pages=	[XEN]

			Boolean option to control scrubbing pages before giving them back

			to Xen, for use by other domains. Can be also changed at runtime

Documentation/firmware-guide/acpi/apei/einj.rst

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ The following files belong to it: 
  0x00000010        Memory Uncorrectable non-fatal

  0x00000020        Memory Uncorrectable fatal

  0x00000040        PCI Express Correctable

  0x00000080        PCI Express Uncorrectable fatal

  0x00000100        PCI Express Uncorrectable non-fatal

  0x00000080        PCI Express Uncorrectable non-fatal

  0x00000100        PCI Express Uncorrectable fatal

  0x00000200        Platform Correctable

  0x00000400        Platform Uncorrectable non-fatal

  0x00000800        Platform Uncorrectable fatal

Documentation/networking/tls-offload.rst

+3 −0
Original line number Diff line number Diff line
@@ -534,3 +534,6 @@ offload. Hence, TLS TX device feature flag requires TX csum offload being set. 
Disabling the latter implies clearing the former. Disabling TX checksum offload

should not affect old connections, and drivers should make sure checksum

calculation does not break for them.

Similarly, device-offloaded TLS decryption implies doing RXCSUM. If the user

does not want to enable RX csum offload, TLS RX device feature is disabled

as well.

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -906,7 +906,7 @@ AMD KFD 
M:	Felix Kuehling <Felix.Kuehling@amd.com>

L:	amd-gfx@lists.freedesktop.org

S:	Supported

T:	git git://people.freedesktop.org/~agd5f/linux

T:	git https://gitlab.freedesktop.org/agd5f/linux.git

F:	drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd*.[ch]

F:	drivers/gpu/drm/amd/amdkfd/

F:	drivers/gpu/drm/amd/include/cik_structs.h
@@ -3334,7 +3334,7 @@ F: arch/riscv/net/ 
X:	arch/riscv/net/bpf_jit_comp64.c









BPF JIT for RISC-V (64-bit)









M:	Björn Töpel <bjorn.topel@gmail.com>









M:	Björn Töpel <bjorn@kernel.org>









L:	netdev@vger.kernel.org









L:	bpf@vger.kernel.org









S:	Maintained








@@ -14827,7 +14827,7 @@ M:	Alex Deucher <alexander.deucher@amd.com>







M:	Christian König <christian.koenig@amd.com>









L:	amd-gfx@lists.freedesktop.org









S:	Supported









T:	git git://people.freedesktop.org/~agd5f/linux









T:	git https://gitlab.freedesktop.org/agd5f/linux.git









F:	drivers/gpu/drm/amd/









F:	drivers/gpu/drm/radeon/









F:	include/uapi/drm/amdgpu_drm.h








@@ -16328,6 +16328,7 @@ M:	Pekka Enberg <penberg@kernel.org>







M:	David Rientjes <rientjes@google.com>









M:	Joonsoo Kim <iamjoonsoo.kim@lge.com>









M:	Andrew Morton <akpm@linux-foundation.org>









M:	Vlastimil Babka <vbabka@suse.cz>









L:	linux-mm@kvack.org









S:	Maintained









F:	include/linux/sl?b*.h








@@ -19430,7 +19431,7 @@ F:	drivers/net/ethernet/*/*/*xdp*







K:	(?:\b|_)xdp(?:\b|_)

















XDP SOCKETS (AF_XDP)









M:	Björn Töpel <bjorn.topel@intel.com>









M:	Björn Töpel <bjorn@kernel.org>









M:	Magnus Karlsson <magnus.karlsson@intel.com>









R:	Jonathan Lemon <jonathan.lemon@gmail.com>









L:	netdev@vger.kernel.org