Skip to content

Commit 29fd422

Browse files
ojedaojeda
authored
Merge pull request torvalds#654 from ojeda/sync
Sync with v5.17-rc2
2 parents 4aa73fd + d286bfe commit 29fd422

File tree

432 files changed

+4637
-2084
lines changed

Some content is hidden

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

432 files changed

+4637
-2084
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
7070
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
7171
Brian Avery <b.avery@hp.com>
7272
Brian King <brking@us.ibm.com>
73+
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
7374
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
7475
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
7576
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

‎Documentation/accounting/psi.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ Triggers can be set on more than one psi metric and more than one trigger
9292
for the same psi metric can be specified. However for each trigger a separate
9393
file descriptor is required to be able to poll it separately from others,
9494
therefore for each trigger a separate open() syscall should be made even
95-
when opening the same psi interface file.
95+
when opening the same psi interface file. Write operations to a file descriptor
96+
with an already existing psi trigger will fail with EBUSY.
9697

9798
Monitors activate only when system enters stall state for the monitored
9899
psi metric and deactivates upon exit from the stall state. While system is

‎Documentation/admin-guide/gpio/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gpio
1010
gpio-aggregator
1111
sysfs
1212
gpio-mockup
13+
gpio-sim
1314

1415
.. only:: subproject and html
1516

‎Documentation/arm/marvell.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,12 @@ Avanta family
266266
-------------
267267

268268
Flavors:
269+
- 88F6500
269270
- 88F6510
270271
- 88F6530P
271272
- 88F6550
272273
- 88F6560
274+
- 88F6601
273275

274276
Homepage:
275277
https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

‎Documentation/arm64/silicon-errata.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ stable kernels.
5252
| Allwinner | A64/R18 | UNKNOWN1 | SUN50I_ERRATUM_UNKNOWN1 |
5353
+----------------+-----------------+-----------------+-----------------------------+
5454
+----------------+-----------------+-----------------+-----------------------------+
55+
| ARM | Cortex-A510 | #2064142 | ARM64_ERRATUM_2064142 |
56+
+----------------+-----------------+-----------------+-----------------------------+
57+
| ARM | Cortex-A510 | #2038923 | ARM64_ERRATUM_2038923 |
58+
+----------------+-----------------+-----------------+-----------------------------+
59+
| ARM | Cortex-A510 | #1902691 | ARM64_ERRATUM_1902691 |
60+
+----------------+-----------------+-----------------+-----------------------------+
5561
| ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 |
5662
+----------------+-----------------+-----------------+-----------------------------+
5763
| ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 |
@@ -92,12 +98,18 @@ stable kernels.
9298
+----------------+-----------------+-----------------+-----------------------------+
9399
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
94100
+----------------+-----------------+-----------------+-----------------------------+
101+
| ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
102+
+----------------+-----------------+-----------------+-----------------------------+
95103
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
96104
+----------------+-----------------+-----------------+-----------------------------+
97105
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
98106
+----------------+-----------------+-----------------+-----------------------------+
99107
| ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 |
100108
+----------------+-----------------+-----------------+-----------------------------+
109+
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
110+
+----------------+-----------------+-----------------+-----------------------------+
111+
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
112+
+----------------+-----------------+-----------------+-----------------------------+
101113
| ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 |
102114
+----------------+-----------------+-----------------+-----------------------------+
103115
| ARM | Neoverse-N1 | #1349291 | N/A |

‎Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ properties:
3636
- renesas,intc-ex-r8a77980 # R-Car V3H
3737
- renesas,intc-ex-r8a77990 # R-Car E3
3838
- renesas,intc-ex-r8a77995 # R-Car D3
39+
- renesas,intc-ex-r8a779a0 # R-Car V3U
3940
- const: renesas,irqc
4041

4142
'#interrupt-cells':

‎Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ properties:
6262

6363
interrupts-extended:
6464
minItems: 1
65+
maxItems: 15872
6566
description:
6667
Specifies which contexts are connected to the PLIC, with "-1" specifying
6768
that a context is not present. Each node pointed to should be a
@@ -90,12 +91,11 @@ examples:
9091
#interrupt-cells = <1>;
9192
compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
9293
interrupt-controller;
93-
interrupts-extended = <
94-
&cpu0_intc 11
95-
&cpu1_intc 11 &cpu1_intc 9
96-
&cpu2_intc 11 &cpu2_intc 9
97-
&cpu3_intc 11 &cpu3_intc 9
98-
&cpu4_intc 11 &cpu4_intc 9>;
94+
interrupts-extended = <&cpu0_intc 11>,
95+
<&cpu1_intc 11>, <&cpu1_intc 9>,
96+
<&cpu2_intc 11>, <&cpu2_intc 9>,
97+
<&cpu3_intc 11>, <&cpu3_intc 9>,
98+
<&cpu4_intc 11>, <&cpu4_intc 9>;
9999
reg = <0xc000000 0x4000000>;
100100
riscv,ndev = <10>;
101101
};

‎Documentation/devicetree/bindings/net/can/tcan4x5x.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ tcan4x5x: tcan4x5x@0 {
3131
#address-cells = <1>;
3232
#size-cells = <1>;
3333
spi-max-frequency = <10000000>;
34-
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
34+
bosch,mram-cfg = <0x0 0 0 16 0 0 1 1>;
3535
interrupt-parent = <&gpio1>;
3636
interrupts = <14 IRQ_TYPE_LEVEL_LOW>;
3737
device-state-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;

‎Documentation/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ to ReStructured Text format, or are simply too old.
167167
.. toctree::
168168
:maxdepth: 2
169169

170+
tools/index
170171
staging/index
171172
watch_queue
172173

‎Documentation/kernel-hacking/locking.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ Pete Zaitcev gives the following summary:
295295

296296
- If you are in a process context (any syscall) and want to lock other
297297
process out, use a mutex. You can take a mutex and sleep
298-
(``copy_from_user*(`` or ``kmalloc(x,GFP_KERNEL)``).
298+
(``copy_from_user()`` or ``kmalloc(x,GFP_KERNEL)``).
299299

300300
- Otherwise (== data can be touched in an interrupt), use
301301
spin_lock_irqsave() and

0 commit comments

Comments
 (0)