Commit 412a5feb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.15-rc6 into tty-next 



We need the serial/tty fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 5f0ac3a1 519d8195

CREDITS

+1 −0
Original line number Original line Diff line number Diff line
@@ -971,6 +971,7 @@ D: PowerPC 
N: Daniel Drake

N: Daniel Drake

E: dsd@gentoo.org

E: dsd@gentoo.org

D: USBAT02 CompactFlash support in usb-storage

D: USBAT02 CompactFlash support in usb-storage

D: ZD1211RW wireless driver

S: UK

S: UK





N: Oleg Drokin

N: Oleg Drokin

Documentation/admin-guide/cgroup-v2.rst

+14 −14
Original line number Original line 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

	Note that all fields in this file are hierarchical and the

	file modified event can be generated due to an event down 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.

	memory.events.local.





	  low

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




Cgroup v2 device controller has no interface files and is implemented

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

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

create bpf programs of type BPF_PROG_TYPE_CGROUP_DEVICE and attach

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

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

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

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

the attempt will succeed or fail with -EPERM.

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

A BPF_PROG_TYPE_CGROUP_DEVICE program takes a pointer to the

structure, which describes the device access attempt: access type

bpf_cgroup_dev_ctx structure, which describes the device access attempt:

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

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

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

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

it succeeds.

succeeds.





An example of BPF_CGROUP_DEVICE program may be found in the kernel

An example of BPF_PROG_TYPE_CGROUP_DEVICE program may be found in

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

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









RDMA

RDMA

Documentation/admin-guide/kernel-parameters.txt

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

			The VGA and EFI output is eventually overwritten by

			the real console.

			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.

			The sclp output can only be used on s390.

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi83.yaml

+0 −2
Original line number Original line Diff line number Diff line
@@ -50,7 +50,6 @@ properties: 
              data-lanes:

              data-lanes:

                description: array of physical DSI data lane indexes.

                description: array of physical DSI data lane indexes.

                minItems: 1

                minItems: 1

                maxItems: 4

                items:

                items:

                  - const: 1

                  - const: 1

                  - const: 2

                  - const: 2
@@ -71,7 +70,6 @@ properties: 
              data-lanes:

              data-lanes:

                description: array of physical DSI data lane indexes.

                description: array of physical DSI data lane indexes.

                minItems: 1

                minItems: 1

                maxItems: 4

                items:

                items:

                  - const: 1

                  - const: 1

                  - const: 2

                  - const: 2

Documentation/devicetree/bindings/display/bridge/ti,sn65dsi86.yaml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ properties: 
    const: ti,sn65dsi86

    const: ti,sn65dsi86





  reg:

  reg:

    const: 0x2d

    enum: [ 0x2c, 0x2d ]





  enable-gpios:

  enable-gpios:

    maxItems: 1

    maxItems: 1