Skip to content

Commit 213cc92

Browse files
danvetdanvet
committed
Merge drm/drm-fixes into drm-next
msm-next pull request has a baseline with stuff from -fixes, roll forward first. Some simple conflicts in amdgpu, ttm and one in i915 where git gets confused and tries to add the same function twice. Signed-off-by: Daniel Vetter <[email protected]>
2 parents cd951b3 + d434405 commit 213cc92

File tree

1,148 files changed

+9427
-5031
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,148 files changed

+9427
-5031
lines changed

‎.mailmap

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ Andrew Morton <[email protected]>
3636
Andrew Murray <[email protected]> <[email protected]>
3737
Andrew Murray <[email protected]> <[email protected]>
3838
Andrew Vasquez <[email protected]>
39+
Andrey Konovalov <[email protected]> <[email protected]>
3940
Andrey Ryabinin <[email protected]> <[email protected]>
4041
Andrey Ryabinin <[email protected]> <[email protected]>
4142
Andy Adamson <[email protected]>
@@ -65,6 +66,8 @@ Changbin Du <[email protected]> <[email protected]>
6566
Changbin Du <[email protected]> <[email protected]>
6667
Chao Yu <[email protected]> <[email protected]>
6768
Chao Yu <[email protected]> <[email protected]>
69+
Chris Chiu <[email protected]> <[email protected]>
70+
Chris Chiu <[email protected]> <[email protected]>
6871
Christophe Ricard <[email protected]>
6972
Christoph Hellwig <[email protected]>
7073
Corey Minyard <[email protected]>
@@ -165,6 +168,7 @@ Johan Hovold <[email protected]> <[email protected]>
165168
Johan Hovold <[email protected]> <[email protected]>
166169
John Paul Adrian Glaubitz <[email protected]>
167170
John Stultz <[email protected]>
171+
Jordan Crouse <[email protected]> <[email protected]>
168172
<[email protected]> <[email protected]>
169173
<[email protected]> <[email protected]>
170174
<[email protected]> <[email protected]>
@@ -250,8 +254,14 @@ Morten Welinder <[email protected]>
250254
Morten Welinder <[email protected]>
251255
Morten Welinder <[email protected]>
252256
Mythri P K <[email protected]>
257+
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
253258
Nathan Chancellor <[email protected]> <[email protected]>
254259
Nguyen Anh Quynh <[email protected]>
260+
Nicholas Piggin <[email protected]> <[email protected]>
261+
Nicholas Piggin <[email protected]> <[email protected]>
262+
Nicholas Piggin <[email protected]> <[email protected]>
263+
Nicholas Piggin <[email protected]> <[email protected]>
264+
Nicholas Piggin <[email protected]> <[email protected]>
255265
Nicolas Ferre <[email protected]> <[email protected]>
256266
Nicolas Pitre <[email protected]> <[email protected]>
257267
Nicolas Pitre <[email protected]> <[email protected]>

‎Documentation/ABI/testing/debugfs-moxtet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/kernel/debug/moxtet/input
22
Date: March 2019
33
KernelVersion: 5.3
4-
Contact: Marek Behún <[email protected]>
4+
Contact: Marek Behún <[email protected]>
55
Description: (Read) Read input from the shift registers, in hexadecimal.
66
Returns N+1 bytes, where N is the number of Moxtet connected
77
modules. The first byte is from the CPU board itself.
@@ -19,7 +19,7 @@ Description: (Read) Read input from the shift registers, in hexadecimal.
1919
What: /sys/kernel/debug/moxtet/output
2020
Date: March 2019
2121
KernelVersion: 5.3
22-
Contact: Marek Behún <[email protected]>
22+
Contact: Marek Behún <[email protected]>
2323
Description: (RW) Read last written value to the shift registers, in
2424
hexadecimal, or write values to the shift registers, also
2525
in hexadecimal.

‎Documentation/ABI/testing/debugfs-turris-mox-rwtm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/kernel/debug/turris-mox-rwtm/do_sign
22
Date: Jun 2020
33
KernelVersion: 5.8
4-
Contact: Marek Behún <[email protected]>
4+
Contact: Marek Behún <[email protected]>
55
Description:
66

77
======= ===========================================================

‎Documentation/ABI/testing/sysfs-bus-moxtet-devices

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_description
22
Date: March 2019
33
KernelVersion: 5.3
4-
Contact: Marek Behún <[email protected]>
4+
Contact: Marek Behún <[email protected]>
55
Description: (Read) Moxtet module description. Format: string
66

77
What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_id
88
Date: March 2019
99
KernelVersion: 5.3
10-
Contact: Marek Behún <[email protected]>
10+
Contact: Marek Behún <[email protected]>
1111
Description: (Read) Moxtet module ID. Format: %x
1212

1313
What: /sys/bus/moxtet/devices/moxtet-<name>.<addr>/module_name
1414
Date: March 2019
1515
KernelVersion: 5.3
16-
Contact: Marek Behún <[email protected]>
16+
Contact: Marek Behún <[email protected]>
1717
Description: (Read) Moxtet module name. Format: string

‎Documentation/ABI/testing/sysfs-class-led-driver-turris-omnia

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/class/leds/<led>/device/brightness
22
Date: July 2020
33
KernelVersion: 5.9
4-
Contact: Marek Behún <[email protected]>
4+
Contact: Marek Behún <[email protected]>
55
Description: (RW) On the front panel of the Turris Omnia router there is also
66
a button which can be used to control the intensity of all the
77
LEDs at once, so that if they are too bright, user can dim them.

‎Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
What: /sys/firmware/turris-mox-rwtm/board_version
22
Date: August 2019
33
KernelVersion: 5.4
4-
Contact: Marek Behún <[email protected]>
4+
Contact: Marek Behún <[email protected]>
55
Description: (Read) Board version burned into eFuses of this Turris Mox board.
66
Format: %i
77

88
What: /sys/firmware/turris-mox-rwtm/mac_address*
99
Date: August 2019
1010
KernelVersion: 5.4
11-
Contact: Marek Behún <[email protected]>
11+
Contact: Marek Behún <[email protected]>
1212
Description: (Read) MAC addresses burned into eFuses of this Turris Mox board.
1313
Format: %pM
1414

1515
What: /sys/firmware/turris-mox-rwtm/pubkey
1616
Date: August 2019
1717
KernelVersion: 5.4
18-
Contact: Marek Behún <[email protected]>
18+
Contact: Marek Behún <[email protected]>
1919
Description: (Read) ECDSA public key (in pubkey hex compressed form) computed
2020
as pair to the ECDSA private key burned into eFuses of this
2121
Turris Mox Board.
@@ -24,14 +24,14 @@ Description: (Read) ECDSA public key (in pubkey hex compressed form) computed
2424
What: /sys/firmware/turris-mox-rwtm/ram_size
2525
Date: August 2019
2626
KernelVersion: 5.4
27-
Contact: Marek Behún <[email protected]>
27+
Contact: Marek Behún <[email protected]>
2828
Description: (Read) RAM size in MiB of this Turris Mox board as was detected
2929
during manufacturing and burned into eFuses. Can be 512 or 1024.
3030
Format: %i
3131

3232
What: /sys/firmware/turris-mox-rwtm/serial_number
3333
Date: August 2019
3434
KernelVersion: 5.4
35-
Contact: Marek Behún <[email protected]>
35+
Contact: Marek Behún <[email protected]>
3636
Description: (Read) Serial number burned into eFuses of this Turris Mox device.
3737
Format: %016X

‎Documentation/ABI/testing/sysfs-fs-xfs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Contact: [email protected]
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently
36-
oustanding transactions, including regrants due to
36+
outstanding transactions, including regrants due to
3737
rolling transactions. The grant head is exported in
3838
"cycle:bytes" format.
3939
Users: xfstests

‎Documentation/arm64/acpi_object_usage.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories:
1717

1818
- Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT
1919

20-
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,
21-
MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,
22-
TCPA, TPM2, UEFI, XENV
20+
- Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,
21+
IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,
22+
STAO, TCPA, TPM2, UEFI, XENV
2323

24-
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,
25-
MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
24+
- Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,
25+
PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT
2626

2727
====== ========================================================================
2828
Table Usage for ARMv8 Linux

‎Documentation/arm64/silicon-errata.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ stable kernels.
130130
| Marvell | ARM-MMU-500 | #582743 | N/A |
131131
+----------------+-----------------+-----------------+-----------------------------+
132132
+----------------+-----------------+-----------------+-----------------------------+
133+
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
134+
+----------------+-----------------+-----------------+-----------------------------+
135+
+----------------+-----------------+-----------------+-----------------------------+
133136
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
134137
+----------------+-----------------+-----------------+-----------------------------+
135138
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Optional node properties:
3232
- "#thermal-sensor-cells" Used to expose itself to thermal fw.
3333

3434
Read more about iio bindings at
35-
Documentation/devicetree/bindings/iio/iio-bindings.txt
35+
https://github.com/devicetree-org/dt-schema/blob/master/schemas/iio/
3636

3737
Example:
3838
ncp15wb473@0 {

0 commit comments

Comments
 (0)