Skip to content

Commit f4a1692

Browse files
author
Thomas Zimmermann
committed
Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes
Updating drm-misc-fixes to v5.8-rc7.
2 parents 8490d6a + 0d78698 commit f4a1692

File tree

2,007 files changed

+19513
-12172
lines changed

Some content is hidden

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

2,007 files changed

+19513
-12172
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ x509.genkey
143143
/allrandom.config
144144
/allyes.config
145145

146+
# Kconfig savedefconfig output
147+
/defconfig
148+
146149
# Kdevelop4
147150
*.kdev4
148151

.mailmap

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,16 @@ Frank Rowand <[email protected]> <[email protected]>
9090
Frank Zago <[email protected]>
9191
9292
93+
94+
95+
9396
Greg Kroah-Hartman <greg@echidna.(none)>
9497
Greg Kroah-Hartman <[email protected]>
9598
Greg Kroah-Hartman <[email protected]>
9699
97100
101+
102+
98103
Henk Vergonet <[email protected]>
99104
Henrik Kretzschmar <[email protected]>
100105
Henrik Rydberg <[email protected]>
@@ -193,6 +198,9 @@ Maxime Ripard <[email protected]> <[email protected]>
193198
Mayuresh Janorkar <[email protected]>
194199
Michael Buesch <[email protected]>
195200
Michel Dänzer <[email protected]>
201+
202+
203+
196204
197205
198206
Mitesh shah <[email protected]>

Documentation/ABI/testing/debugfs-driver-habanalabs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ Description: Allow the root user to disable/enable in runtime the clock
1616
gating mechanism in Gaudi. Due to how Gaudi is built, the
1717
clock gating needs to be disabled in order to access the
1818
registers of the TPC and MME engines. This is sometimes needed
19-
during debug by the user and hence the user needs this option
19+
during debug by the user and hence the user needs this option.
20+
The user can supply a bitmask value, each bit represents
21+
a different engine to disable/enable its clock gating feature.
22+
The bitmask is composed of 20 bits:
23+
0 - 7 : DMA channels
24+
8 - 11 : MME engines
25+
12 - 19 : TPC engines
26+
The bit's location of a specific engine can be determined
27+
using (1 << GAUDI_ENGINE_ID_*). GAUDI_ENGINE_ID_* values
28+
are defined in uapi habanalabs.h file in enum gaudi_engine_id
2029

2130
What: /sys/kernel/debug/habanalabs/hl<n>/command_buffers
2231
Date: Jan 2019

Documentation/ABI/testing/dev-kmsg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ Description: The /dev/kmsg character device node provides userspace access
5656
seek after the last record available at the time
5757
the last SYSLOG_ACTION_CLEAR was issued.
5858

59-
Due to the record nature of this interface with a "read all"
60-
behavior and the specific positions each seek operation sets,
61-
SEEK_CUR is not supported, returning -ESPIPE (invalid seek) to
62-
errno whenever requested.
63-
6459
The output format consists of a prefix carrying the syslog
6560
prefix including priority and facility, the 64 bit message
6661
sequence number and the monotonic timestamp in microseconds,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/bus/nd/devices/nmemX/papr/flags
2+
Date: Apr, 2020
3+
KernelVersion: v5.8
4+
Contact: linuxppc-dev <[email protected]>, [email protected],
5+
Description:
6+
(RO) Report flags indicating various states of a
7+
papr-pmem NVDIMM device. Each flag maps to a one or
8+
more bits set in the dimm-health-bitmap retrieved in
9+
response to H_SCM_HEALTH hcall. The details of the bit
10+
flags returned in response to this hcall is available
11+
at 'Documentation/powerpc/papr_hcalls.rst' . Below are
12+
the flags reported in this sysfs file:
13+
14+
* "not_armed" : Indicates that NVDIMM contents will not
15+
survive a power cycle.
16+
* "flush_fail" : Indicates that NVDIMM contents
17+
couldn't be flushed during last
18+
shut-down event.
19+
* "restore_fail": Indicates that NVDIMM contents
20+
couldn't be restored during NVDIMM
21+
initialization.
22+
* "encrypted" : NVDIMM contents are encrypted.
23+
* "smart_notify": There is health event for the NVDIMM.
24+
* "scrubbed" : Indicating that contents of the
25+
NVDIMM have been scrubbed.
26+
* "locked" : Indicating that NVDIMM contents cant
27+
be modified until next power cycle.

Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
22
Date: Feb 2014
3-
Contact: Li Jun <b47624@freescale.com>
3+
Contact: Li Jun <jun.li@nxp.com>
44
Description:
55
Can be set and read.
66
Set a_bus_req(A-device bus request) input to be 1 if
@@ -17,7 +17,7 @@ Description:
1717

1818
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
1919
Date: Feb 2014
20-
Contact: Li Jun <b47624@freescale.com>
20+
Contact: Li Jun <jun.li@nxp.com>
2121
Description:
2222
Can be set and read
2323
The a_bus_drop(A-device bus drop) input is 1 when the
@@ -32,7 +32,7 @@ Description:
3232

3333
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
3434
Date: Feb 2014
35-
Contact: Li Jun <b47624@freescale.com>
35+
Contact: Li Jun <jun.li@nxp.com>
3636
Description:
3737
Can be set and read.
3838
The b_bus_req(B-device bus request) input is 1 during the time
@@ -47,7 +47,7 @@ Description:
4747

4848
What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
4949
Date: Feb 2014
50-
Contact: Li Jun <b47624@freescale.com>
50+
Contact: Li Jun <jun.li@nxp.com>
5151
Description:
5252
Only can be set.
5353
The a_clr_err(A-device Vbus error clear) input is used to clear

Documentation/admin-guide/README.rst

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

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

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

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,8 +1356,8 @@ PAGE_SIZE multiple when read back.
13561356

13571357
thp_fault_alloc
13581358
Number of transparent hugepages which were allocated to satisfy
1359-
a page fault, including COW faults. This counter is not present
1360-
when CONFIG_TRANSPARENT_HUGEPAGE is not set.
1359+
a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE
1360+
is not set.
13611361

13621362
thp_collapse_alloc
13631363
Number of transparent hugepages which were allocated to allow

Documentation/admin-guide/device-mapper/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Device Mapper
1111
dm-clone
1212
dm-crypt
1313
dm-dust
14+
dm-ebs
1415
dm-flakey
1516
dm-init
1617
dm-integrity

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,7 @@ monitor how successfully the system is providing huge pages for use.
305305

306306
thp_fault_alloc
307307
is incremented every time a huge page is successfully
308-
allocated to handle a page fault. This applies to both the
309-
first time a page is faulted and for COW faults.
308+
allocated to handle a page fault.
310309

311310
thp_collapse_alloc
312311
is incremented by khugepaged when it has found

0 commit comments

Comments
 (0)