Skip to content

Commit 99105cc

Browse files
bebarinobebarino
committed
Merge tag 'v5.17-rc4' into clk-ti
We want to get commit 31aa705 ("ARM: dts: Don't use legacy clock defines for dra7 clkctrl") so merge in the nearest rc.
2 parents ed06099 + 754e0b0 commit 99105cc

1,021 files changed

Lines changed: 11656 additions & 5524 deletions

File tree

Some content is hidden

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

‎.mailmap‎

Lines changed: 4 additions & 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>
@@ -79,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
7980
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
8081
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
8182
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
83+
Christian Brauner <brauner@kernel.org> <christian@brauner.io>
84+
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
85+
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
8286
Christophe Ricard <christophe.ricard@gmail.com>
8387
Christoph Hellwig <hch@lst.de>
8488
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

‎Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/uart*
1+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*
22
Date: September 2021
33
Contact: Oskar Senft <osk@google.com>
44
Chia-Wei Wang <chiawei_wang@aspeedtech.com>
@@ -9,15 +9,15 @@ Description: Selects the RX source of the UARTx device.
99
depends on the selected file.
1010

1111
e.g.
12-
cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1
12+
cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1
1313
[io1] io2 io3 io4 uart2 uart3 uart4 io6
1414

1515
In this case, UART1 gets its input from IO1 (physical serial port 1).
1616

1717
Users: OpenBMC. Proposed changes should be mailed to
1818
openbmc@lists.ozlabs.org
1919

20-
What: /sys/bus/platform/drivers/aspeed-uart-routing/*/io*
20+
What: /sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*
2121
Date: September 2021
2222
Contact: Oskar Senft <osk@google.com>
2323
Chia-Wei Wang <chiawei_wang@aspeedtech.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: 14 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,20 @@ stable kernels.
9298
+----------------+-----------------+-----------------+-----------------------------+
9399
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
94100
+----------------+-----------------+-----------------+-----------------------------+
101+
| ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
102+
+----------------+-----------------+-----------------+-----------------------------+
103+
| ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 |
104+
+----------------+-----------------+-----------------+-----------------------------+
95105
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
96106
+----------------+-----------------+-----------------+-----------------------------+
97107
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
98108
+----------------+-----------------+-----------------+-----------------------------+
99109
| ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 |
100110
+----------------+-----------------+-----------------+-----------------------------+
111+
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
112+
+----------------+-----------------+-----------------+-----------------------------+
113+
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
114+
+----------------+-----------------+-----------------+-----------------------------+
101115
| ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 |
102116
+----------------+-----------------+-----------------+-----------------------------+
103117
| ARM | Neoverse-N1 | #1349291 | N/A |

‎Documentation/dev-tools/kselftest.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code
77
paths in the kernel. Tests are intended to be run after building, installing
88
and booting a kernel.
99

10+
Kselftest from mainline can be run on older stable kernels. Running tests
11+
from mainline offers the best coverage. Several test rings run mainline
12+
kselftest suite on stable releases. The reason is that when a new test
13+
gets added to test existing code to regression test a bug, we should be
14+
able to run that test on an older kernel. Hence, it is important to keep
15+
code that can still test an older kernel and make sure it skips the test
16+
gracefully on newer releases.
17+
1018
You can find additional information on Kselftest framework, how to
1119
write new tests using the framework on Kselftest wiki:
1220

‎Documentation/dev-tools/kunit/usage.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ example:
242242
243243
int rectangle_area(struct shape *this)
244244
{
245-
struct rectangle *self = container_of(this, struct shape, parent);
245+
struct rectangle *self = container_of(this, struct rectangle, parent);
246246
247247
return self->length * self->width;
248248
};

‎Documentation/devicetree/bindings/arm/omap/omap.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ Boards (incomplete list of examples):
119119
- OMAP3 BeagleBoard : Low cost community board
120120
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
121121

122+
- OMAP3 BeagleBoard A to B4 : Early BeagleBoard revisions A to B4 with a timer quirk
123+
compatible = "ti,omap3-beagle-ab4", "ti,omap3-beagle", "ti,omap3430", "ti,omap3"
124+
122125
- OMAP3 Tobi with Overo : Commercial expansion board with daughter board
123126
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3430", "ti,omap3"
124127

‎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':

0 commit comments

Comments
 (0)