Skip to content

Commit fb51bf0

Browse files
committed
Merge tag 'v6.14-rc4' into drm-next
Backmerge Linux 6.14-rc4 at the request of tzimmermann so misc-next can base on rc4. Signed-off-by: Dave Airlie <[email protected]>
2 parents 7b91683 + d082ecb commit fb51bf0

File tree

589 files changed

+6602
-3319
lines changed

Some content is hidden

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

589 files changed

+6602
-3319
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ Fangrui Song <[email protected]> <[email protected]>
226226
Felipe W Damasio <[email protected]>
227227
Felix Kuhling <[email protected]>
228228
Felix Moeller <[email protected]>
229+
229230
230231
Filipe Lautert <[email protected]>
231232
@@ -317,6 +318,8 @@ Jayachandran C <[email protected]> <[email protected]>
317318
Jean Tourrilhes <[email protected]>
318319
319320
Jeff Garzik <[email protected]>
321+
322+
320323
321324
322325
@@ -376,6 +379,7 @@ Juha Yrjola <[email protected]>
376379
377380
378381
382+
379383
380384
Karthikeyan Periyasamy <[email protected]> <[email protected]>
381385
@@ -530,6 +534,7 @@ Nicholas Piggin <[email protected]> <[email protected]>
530534
531535
532536
537+
533538
534539
535540

Documentation/arch/arm64/gcs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ intended to be exhaustive.
3737
shadow stacks rather than GCS.
3838

3939
* Support for GCS is reported to userspace via HWCAP_GCS in the aux vector
40-
AT_HWCAP2 entry.
40+
AT_HWCAP entry.
4141

4242
* GCS is enabled per thread. While there is support for disabling GCS
4343
at runtime this should be done with great care.

Documentation/arch/x86/sva.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to cache translations for virtual addresses. The IOMMU driver uses the
2525
mmu_notifier() support to keep the device TLB cache and the CPU cache in
2626
sync. When an ATS lookup fails for a virtual address, the device should
2727
use the PRI in order to request the virtual address to be paged into the
28-
CPU page tables. The device must use ATS again in order the fetch the
28+
CPU page tables. The device must use ATS again in order to fetch the
2929
translation before use.
3030

3131
Shared Hardware Workqueues
@@ -216,7 +216,7 @@ submitting work and processing completions.
216216

217217
Single Root I/O Virtualization (SR-IOV) focuses on providing independent
218218
hardware interfaces for virtualizing hardware. Hence, it's required to be
219-
almost fully functional interface to software supporting the traditional
219+
an almost fully functional interface to software supporting the traditional
220220
BARs, space for interrupts via MSI-X, its own register layout.
221221
Virtual Functions (VFs) are assisted by the Physical Function (PF)
222222
driver.

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ properties:
5353
reg:
5454
maxItems: 1
5555

56+
power-controller:
57+
type: object
58+
59+
reboot-mode:
60+
type: object
61+
5662
required:
5763
- compatible
5864
- reg
5965

60-
additionalProperties: true
66+
additionalProperties: false
6167

6268
examples:
6369
- |

Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

Documentation/devicetree/bindings/clock/qcom,sa8775p-camcc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

Documentation/devicetree/bindings/clock/qcom,sa8775p-videocc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,hx8238a.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,hx8238a
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/panel/powertip,st7272.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Powertip Electronic Technology Co. 320 x 240 LCD panel
8+
9+
maintainers:
10+
- Lukasz Majewski <[email protected]>
11+
12+
allOf:
13+
- $ref: panel-dpi.yaml#
14+
15+
properties:
16+
compatible:
17+
items:
18+
- const: powertip,st7272
19+
- {} # panel-dpi, but not listed here to avoid false select
20+
21+
height-mm: true
22+
panel-timing: true
23+
port: true
24+
power-supply: true
25+
width-mm: true
26+
27+
additionalProperties: false
28+
29+
...

Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ properties:
2323
compatible:
2424
enum:
2525
- ti,am625-dss
26-
- ti,am62a7,dss
26+
- ti,am62a7-dss
2727
- ti,am65x-dss
2828

2929
reg:

0 commit comments

Comments
 (0)