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

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



tools/testing/selftests/net/ioam6.sh
  7b1700e0 ("selftests: net: modify IOAM tests for undef bits")
  bf77b140 ("selftests: net: Test for the IOAM encapsulation with IPv6")

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

Documentation/admin-guide/cgroup-v2.rst

+14 −14
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ PAGE_SIZE multiple when read back. 


	Note that all fields in this file are hierarchical and the

	file modified event can be generated due to an event down the

	hierarchy. For for the local events at the cgroup level see

	hierarchy. For the local events at the cgroup level see

	memory.events.local.



	  low
@@ -2170,19 +2170,19 @@ existing device files. 


Cgroup v2 device controller has no interface files and is implemented

on top of cgroup BPF. To control access to device files, a user may

create bpf programs of the BPF_CGROUP_DEVICE type and attach them

to cgroups. On an attempt to access a device file, corresponding

BPF programs will be executed, and depending on the return value

the attempt will succeed or fail with -EPERM.



A BPF_CGROUP_DEVICE program takes a pointer to the bpf_cgroup_dev_ctx

structure, which describes the device access attempt: access type

(mknod/read/write) and device (type, major and minor numbers).

If the program returns 0, the attempt fails with -EPERM, otherwise

it succeeds.



An example of BPF_CGROUP_DEVICE program may be found in the kernel

source tree in the tools/testing/selftests/bpf/progs/dev_cgroup.c file.

create bpf programs of type BPF_PROG_TYPE_CGROUP_DEVICE and attach

them to cgroups with BPF_CGROUP_DEVICE flag. On an attempt to access a

device file, corresponding BPF programs will be executed, and depending

on the return value the attempt will succeed or fail with -EPERM.



A BPF_PROG_TYPE_CGROUP_DEVICE program takes a pointer to the

bpf_cgroup_dev_ctx structure, which describes the device access attempt:

access type (mknod/read/write) and device (type, major and minor numbers).

If the program returns 0, the attempt fails with -EPERM, otherwise it

succeeds.



An example of BPF_PROG_TYPE_CGROUP_DEVICE program may be found in

tools/testing/selftests/bpf/progs/dev_cgroup.c in the kernel source tree.





RDMA

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,7 @@ 
			The VGA and EFI output is eventually overwritten by

			the real console.



			The xen output can only be used by Xen PV guests.

			The xen option can only be used in Xen domains.



			The sclp output can only be used on s390.

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ select: 
      contains:

        enum:

          - snps,dwmac

          - snps,dwmac-3.40a

          - snps,dwmac-3.50a

          - snps,dwmac-3.610

          - snps,dwmac-3.70a
@@ -76,6 +77,7 @@ properties: 
        - rockchip,rk3399-gmac

        - rockchip,rv1108-gmac

        - snps,dwmac

        - snps,dwmac-3.40a

        - snps,dwmac-3.50a

        - snps,dwmac-3.610

        - snps,dwmac-3.70a

Documentation/gpu/amdgpu.rst

+2 −2
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ pcie_replay_count 
.. kernel-doc:: drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

   :doc: pcie_replay_count



+GPU SmartShift Information

============================

GPU SmartShift Information

==========================



GPU SmartShift information via sysfs

Documentation/gpu/drm-internals.rst

+0 −9
Original line number Diff line number Diff line
@@ -111,15 +111,6 @@ Component Helper Usage 
.. kernel-doc:: drivers/gpu/drm/drm_drv.c

   :doc: component helper usage recommendations



IRQ Helper Library

~~~~~~~~~~~~~~~~~~



.. kernel-doc:: drivers/gpu/drm/drm_irq.c

   :doc: irq helpers



.. kernel-doc:: drivers/gpu/drm/drm_irq.c

   :export:



Memory Manager Initialization

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~