Skip to content

Commit 41206a0

Browse files
airliedairlied
committed
Merge v5.8-rc6 into drm-next
I've got a silent conflict + two trees based on fixes to merge. Fixes a silent merge with amdgpu Signed-off-by: Dave Airlie <[email protected]>
2 parents 2067391 + ba47d84 commit 41206a0

File tree

1,370 files changed

+11770
-6410
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,370 files changed

+11770
-6410
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: 5 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
Gao Xiang <[email protected]> <[email protected]>
9292
Gao Xiang <[email protected]> <[email protected]>
93+
Gerald Schaefer <[email protected]> <[email protected]>
94+
Gerald Schaefer <[email protected]> <[email protected]>
95+
Gerald Schaefer <[email protected]> <[email protected]>
9396
Greg Kroah-Hartman <greg@echidna.(none)>
9497
Greg Kroah-Hartman <[email protected]>
9598
Greg Kroah-Hartman <[email protected]>
9699
Gregory CLEMENT <[email protected]> <[email protected]>
97100
Hanjun Guo <[email protected]> <[email protected]>
101+
Heiko Carstens <[email protected]> <[email protected]>
102+
Heiko Carstens <[email protected]> <[email protected]>
98103
Henk Vergonet <[email protected]>
99104
Henrik Kretzschmar <[email protected]>
100105
Henrik Rydberg <[email protected]>

‎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,

‎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

‎Documentation/arm64/cpu-feature-registers.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ infrastructure:
171171

172172

173173
3) ID_AA64PFR1_EL1 - Processor Feature Register 1
174+
174175
+------------------------------+---------+---------+
175176
| Name | bits | visible |
176177
+------------------------------+---------+---------+
@@ -181,6 +182,7 @@ infrastructure:
181182

182183

183184
4) MIDR_EL1 - Main ID Register
185+
184186
+------------------------------+---------+---------+
185187
| Name | bits | visible |
186188
+------------------------------+---------+---------+

‎Documentation/arm64/silicon-errata.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ stable kernels.
147147
+----------------+-----------------+-----------------+-----------------------------+
148148
| Qualcomm Tech. | Falkor v{1,2} | E1041 | QCOM_FALKOR_ERRATUM_1041 |
149149
+----------------+-----------------+-----------------+-----------------------------+
150+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1463225 |
151+
+----------------+-----------------+-----------------+-----------------------------+
152+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1418040 |
153+
+----------------+-----------------+-----------------+-----------------------------+
154+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1530923 |
155+
+----------------+-----------------+-----------------+-----------------------------+
156+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
157+
+----------------+-----------------+-----------------+-----------------------------+
150158
+----------------+-----------------+-----------------+-----------------------------+
151159
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
152160
+----------------+-----------------+-----------------+-----------------------------+

0 commit comments

Comments
 (0)