Skip to content

Commit 99b03ca

Browse files
danvetdanvet
committed
Merge v5.16-rc5 into drm-next
Thomas Zimmermann requested a fixes backmerge, specifically also for 96c5f82 ("drm/vc4: fix error code in vc4_create_object()") Just a bunch of adjacent changes conflicts, even the big pile of them in vc4. Signed-off-by: Daniel Vetter <[email protected]>
2 parents 211b4db + 2585cf9 commit 99b03ca

File tree

929 files changed

+10985
-7121
lines changed

Some content is hidden

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

929 files changed

+10985
-7121
lines changed

‎.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ Greg Kroah-Hartman <[email protected]>
126126
Greg Kroah-Hartman <[email protected]>
127127
Greg Kurz <[email protected]> <[email protected]>
128128
Gregory CLEMENT <[email protected]> <[email protected]>
129+
Guo Ren <[email protected]> <[email protected]>
130+
Guo Ren <[email protected]> <[email protected]>
129131
Gustavo Padovan <[email protected]>
130132
Gustavo Padovan <[email protected]>
131133
Hanjun Guo <[email protected]> <[email protected]>

‎Documentation/admin-guide/blockdev/drbd/figures.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ Sub graphs of DRBD's state transitions
2525
:alt: disk-states-8.dot
2626
:align: center
2727

28-
.. kernel-figure:: node-states-8.dot
29-
:alt: node-states-8.dot
28+
.. kernel-figure:: peer-states-8.dot
29+
:alt: peer-states-8.dot
3030
:align: center

‎Documentation/admin-guide/blockdev/drbd/node-states-8.dot renamed to ‎Documentation/admin-guide/blockdev/drbd/peer-states-8.dot

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
digraph node_states {
2-
Secondary -> Primary [ label = "ioctl_set_state()" ]
3-
Primary -> Secondary [ label = "ioctl_set_state()" ]
4-
}
5-
61
digraph peer_states {
72
Secondary -> Primary [ label = "recv state packet" ]
83
Primary -> Secondary [ label = "recv state packet" ]

‎Documentation/arm64/pointer-authentication.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,10 @@ The number of bits that the PAC occupies in a pointer is 55 minus the
5353
virtual address size configured by the kernel. For example, with a
5454
virtual address size of 48, the PAC is 7 bits wide.
5555

56-
Recent versions of GCC can compile code with APIAKey-based return
57-
address protection when passed the -msign-return-address option. This
58-
uses instructions in the HINT space (unless -march=armv8.3-a or higher
59-
is also passed), and such code can run on systems without the pointer
60-
authentication extension.
56+
When ARM64_PTR_AUTH_KERNEL is selected, the kernel will be compiled
57+
with HINT space pointer authentication instructions protecting
58+
function returns. Kernels built with this option will work on hardware
59+
with or without pointer authentication support.
6160

6261
In addition to exec(), keys can also be reinitialized to random values
6362
using the PR_PAC_RESET_KEYS prctl. A bitmask of PR_PAC_APIAKEY,

‎Documentation/conf.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,16 @@
249249

250250
html_static_path = ['sphinx-static']
251251

252-
html_context = {
253-
'css_files': [
254-
'_static/theme_overrides.css',
255-
],
256-
}
252+
html_css_files = [
253+
'theme_overrides.css',
254+
]
255+
256+
if major <= 1 and minor < 8:
257+
html_context = {
258+
'css_files': [
259+
'_static/theme_overrides.css',
260+
],
261+
}
257262

258263
# Add any extra paths that contain custom files (such as robots.txt or
259264
# .htaccess) here, relative to this directory. These files are copied

‎Documentation/cpu-freq/core.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ CPUFREQ_POSTCHANGE.
7373
The third argument is a struct cpufreq_freqs with the following
7474
values:
7575

76-
===== ===========================
77-
cpu number of the affected CPU
76+
====== ======================================
77+
policy a pointer to the struct cpufreq_policy
7878
old old frequency
7979
new new frequency
8080
flags flags of the cpufreq driver
81-
===== ===========================
81+
====== ======================================
8282

8383
3. CPUFreq Table Generation with Operating Performance Point (OPP)
8484
==================================================================

‎Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ properties:
1717
oneOf:
1818
- enum:
1919
- fsl,imx7ulp-lpi2c
20-
- fsl,imx8qm-lpi2c
2120
- items:
22-
- const: fsl,imx8qxp-lpi2c
21+
- enum:
22+
- fsl,imx8qxp-lpi2c
23+
- fsl,imx8qm-lpi2c
2324
- const: fsl,imx7ulp-lpi2c
2425

2526
reg:

‎Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ examples:
136136
samsung,syscon-phandle = <&pmu_system_controller>;
137137
138138
/* NTC thermistor is a hwmon device */
139-
ncp15wb473 {
139+
thermistor {
140140
compatible = "murata,ncp15wb473";
141141
pullup-uv = <1800000>;
142142
pullup-ohm = <47000>;

‎Documentation/devicetree/bindings/input/gpio-keys.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ examples:
142142
down {
143143
label = "GPIO Key DOWN";
144144
linux,code = <108>;
145-
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
145+
interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
146146
};
147147
};
148148

‎Documentation/devicetree/bindings/media/nxp,imx7-mipi-csi2.yaml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ properties:
7979

8080
properties:
8181
data-lanes:
82+
description:
83+
Note that 'fsl,imx7-mipi-csi2' only supports up to 2 data lines.
8284
items:
8385
minItems: 1
8486
maxItems: 4
@@ -91,18 +93,6 @@ properties:
9193
required:
9294
- data-lanes
9395

94-
allOf:
95-
- if:
96-
properties:
97-
compatible:
98-
contains:
99-
const: fsl,imx7-mipi-csi2
100-
then:
101-
properties:
102-
data-lanes:
103-
items:
104-
maxItems: 2
105-
10696
port@1:
10797
$ref: /schemas/graph.yaml#/properties/port
10898
description:

0 commit comments

Comments
 (0)