Skip to content

Commit ed96f35

Browse files
committed
Merge tag 'v5.15-rc6' into regulator-5.16
Linux 5.15-rc6
2 parents 72bf80c + 519d819 commit ed96f35

File tree

1,520 files changed

+17429
-9954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,520 files changed

+17429
-9954
lines changed

CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ D: PowerPC
971971
N: Daniel Drake
972972
973973
D: USBAT02 CompactFlash support in usb-storage
974+
D: ZD1211RW wireless driver
974975
S: UK
975976

976977
N: Oleg Drokin

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ Configuring the kernel
259259
Compiling the kernel
260260
--------------------
261261

262-
- Make sure you have at least gcc 4.9 available.
262+
- Make sure you have at least gcc 5.1 available.
263263
For more information, refer to :ref:`Documentation/process/changes.rst <changes>`.
264264

265265
Please note that you can still run a.out user programs with this kernel.

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ PAGE_SIZE multiple when read back.
12261226

12271227
Note that all fields in this file are hierarchical and the
12281228
file modified event can be generated due to an event down the
1229-
hierarchy. For for the local events at the cgroup level see
1229+
hierarchy. For the local events at the cgroup level see
12301230
memory.events.local.
12311231

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

21712171
Cgroup v2 device controller has no interface files and is implemented
21722172
on top of cgroup BPF. To control access to device files, a user may
2173-
create bpf programs of the BPF_CGROUP_DEVICE type and attach them
2174-
to cgroups. On an attempt to access a device file, corresponding
2175-
BPF programs will be executed, and depending on the return value
2176-
the attempt will succeed or fail with -EPERM.
2177-
2178-
A BPF_CGROUP_DEVICE program takes a pointer to the bpf_cgroup_dev_ctx
2179-
structure, which describes the device access attempt: access type
2180-
(mknod/read/write) and device (type, major and minor numbers).
2181-
If the program returns 0, the attempt fails with -EPERM, otherwise
2182-
it succeeds.
2183-
2184-
An example of BPF_CGROUP_DEVICE program may be found in the kernel
2185-
source tree in the tools/testing/selftests/bpf/progs/dev_cgroup.c file.
2173+
create bpf programs of type BPF_PROG_TYPE_CGROUP_DEVICE and attach
2174+
them to cgroups with BPF_CGROUP_DEVICE flag. On an attempt to access a
2175+
device file, corresponding BPF programs will be executed, and depending
2176+
on the return value the attempt will succeed or fail with -EPERM.
2177+
2178+
A BPF_PROG_TYPE_CGROUP_DEVICE program takes a pointer to the
2179+
bpf_cgroup_dev_ctx structure, which describes the device access attempt:
2180+
access type (mknod/read/write) and device (type, major and minor numbers).
2181+
If the program returns 0, the attempt fails with -EPERM, otherwise it
2182+
succeeds.
2183+
2184+
An example of BPF_PROG_TYPE_CGROUP_DEVICE program may be found in
2185+
tools/testing/selftests/bpf/progs/dev_cgroup.c in the kernel source tree.
21862186

21872187

21882188
RDMA

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@
12661266
The VGA and EFI output is eventually overwritten by
12671267
the real console.
12681268

1269-
The xen output can only be used by Xen PV guests.
1269+
The xen option can only be used in Xen domains.
12701270

12711271
The sclp output can only be used on s390.
12721272

Documentation/core-api/irq/irq-domain.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,10 @@ for IRQ numbers that are passed to struct device registrations. In that
175175
case the Linux IRQ numbers cannot be dynamically assigned and the legacy
176176
mapping should be used.
177177

178-
As the name implies, the *_legacy() functions are deprecated and only
178+
As the name implies, the \*_legacy() functions are deprecated and only
179179
exist to ease the support of ancient platforms. No new users should be
180-
added.
180+
added. Same goes for the \*_simple() functions when their use results
181+
in the legacy behaviour.
181182

182183
The legacy map assumes a contiguous range of IRQ numbers has already
183184
been allocated for the controller and that the IRQ number can be

Documentation/devicetree/bindings/arm/tegra.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ properties:
5454
- const: toradex,apalis_t30
5555
- const: nvidia,tegra30
5656
- items:
57-
- const: toradex,apalis_t30-eval-v1.1
57+
- const: toradex,apalis_t30-v1.1-eval
5858
- const: toradex,apalis_t30-eval
5959
- const: toradex,apalis_t30-v1.1
6060
- const: toradex,apalis_t30

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ properties:
5050
data-lanes:
5151
description: array of physical DSI data lane indexes.
5252
minItems: 1
53-
maxItems: 4
5453
items:
5554
- const: 1
5655
- const: 2
@@ -71,7 +70,6 @@ properties:
7170
data-lanes:
7271
description: array of physical DSI data lane indexes.
7372
minItems: 1
74-
maxItems: 4
7573
items:
7674
- const: 1
7775
- const: 2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ properties:
1818
const: ti,sn65dsi86
1919

2020
reg:
21-
const: 0x2d
21+
enum: [ 0x2c, 0x2d ]
2222

2323
enable-gpios:
2424
maxItems: 1

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function block.
99

1010
All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
1111
For a description of the MMSYS_CONFIG binding, see
12-
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
12+
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.
1313

1414
DISP function blocks
1515
====================

Documentation/devicetree/bindings/display/panel/ilitek,ili9341.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ properties:
2222
items:
2323
- enum:
2424
# ili9341 240*320 Color on stm32f429-disco board
25-
- st,sf-tc240t-9370-t
25+
- st,sf-tc240t-9370-t
2626
- const: ilitek,ili9341
2727

2828
reg: true

0 commit comments

Comments
 (0)