Skip to content

Commit d2206fc

Browse files
committed
Merge tag 'irq-api-2022-02-21' into irq/core
Merge the generic_handle_irq_safe() API back into irq/core.
2 parents fe13889 + 509853f commit d2206fc

861 files changed

Lines changed: 8738 additions & 4856 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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
8080
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
8181
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
8282
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>
8386
Christophe Ricard <christophe.ricard@gmail.com>
8487
Christoph Hellwig <hch@lst.de>
8588
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/ABI/testing/sysfs-class-power

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ Description:
468468
auto: Charge normally, respect thresholds
469469
inhibit-charge: Do not charge while AC is attached
470470
force-discharge: Force discharge while AC is attached
471+
================ ====================================
471472

472473
What: /sys/class/power_supply/<supply_name>/technology
473474
Date: May 2007

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/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@ stable kernels.
100100
+----------------+-----------------+-----------------+-----------------------------+
101101
| ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
102102
+----------------+-----------------+-----------------+-----------------------------+
103+
| ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 |
104+
+----------------+-----------------+-----------------+-----------------------------+
103105
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
104106
+----------------+-----------------+-----------------+-----------------------------+
105107
| ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |

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/sifive,plic-1.0.0.yaml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,28 @@ description:
3535
contains a specific memory layout, which is documented in chapter 8 of the
3636
SiFive U5 Coreplex Series Manual <https://static.dev.sifive.com/U54-MC-RVCoreIP.pdf>.
3737

38+
The thead,c900-plic is different from sifive,plic-1.0.0 in opensbi, the
39+
T-HEAD PLIC implementation requires setting a delegation bit to allow access
40+
from S-mode. So add thead,c900-plic to distinguish them.
41+
3842
maintainers:
3943
- Sagar Kadam <sagar.kadam@sifive.com>
4044
- Paul Walmsley <paul.walmsley@sifive.com>
4145
- Palmer Dabbelt <palmer@dabbelt.com>
4246

4347
properties:
4448
compatible:
45-
items:
46-
- enum:
47-
- sifive,fu540-c000-plic
48-
- starfive,jh7100-plic
49-
- canaan,k210-plic
50-
- const: sifive,plic-1.0.0
49+
oneOf:
50+
- items:
51+
- enum:
52+
- sifive,fu540-c000-plic
53+
- starfive,jh7100-plic
54+
- canaan,k210-plic
55+
- const: sifive,plic-1.0.0
56+
- items:
57+
- enum:
58+
- allwinner,sun20i-d1-plic
59+
- const: thead,c900-plic
5160

5261
reg:
5362
maxItems: 1

Documentation/devicetree/bindings/net/qcom,ipa.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ properties:
107107
- const: imem
108108
- const: config
109109

110+
qcom,qmp:
111+
$ref: /schemas/types.yaml#/definitions/phandle
112+
description: phandle to the AOSS side-channel message RAM
113+
110114
qcom,smem-states:
111115
$ref: /schemas/types.yaml#/definitions/phandle-array
112116
description: State bits used in by the AP to signal the modem.
@@ -222,6 +226,8 @@ examples:
222226
"imem",
223227
"config";
224228
229+
qcom,qmp = <&aoss_qmp>;
230+
225231
qcom,smem-states = <&ipa_smp2p_out 0>,
226232
<&ipa_smp2p_out 1>;
227233
qcom,smem-state-names = "ipa-clock-enabled-valid",

Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Audio codec controlled by ChromeOS EC
88

99
maintainers:
1010
- Cheng-Yi Chiang <cychiang@chromium.org>
11+
- Tzung-Bi Shih <tzungbi@google.com>
1112

1213
description: |
1314
Google's ChromeOS EC codec is a digital mic codec provided by the

0 commit comments

Comments
 (0)