Skip to content

Commit f9e7f3f

Browse files
gregkhgregkh
committed
Merge 6.13-rc3 into staging-next
We need the gpib build fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2 parents 0a4edbe + 78d4f34 commit f9e7f3f

File tree

746 files changed

+12538
-8617
lines changed

Some content is hidden

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

746 files changed

+12538
-8617
lines changed

‎Documentation/ABI/testing/sysfs-class-watchdog‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Description:
7676
timeout when the pretimeout interrupt is delivered. Pretimeout
7777
is an optional feature.
7878

79-
What: /sys/class/watchdog/watchdogn/pretimeout_avaialable_governors
79+
What: /sys/class/watchdog/watchdogn/pretimeout_available_governors
8080
Date: February 2017
8181
Contact: Wim Van Sebroeck <[email protected]>
8282
Description:

‎Documentation/admin-guide/kernel-parameters.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,6 +4822,11 @@
48224822
can be preempted anytime. Tasks will also yield
48234823
contended spinlocks (if the critical section isn't
48244824
explicitly preempt disabled beyond the lock itself).
4825+
lazy - Scheduler controlled. Similar to full but instead
4826+
of preempting the task immediately, the task gets
4827+
one HZ tick time to yield itself before the
4828+
preemption will be forced. One preemption is when the
4829+
task returns to user space.
48254830

48264831
print-fatal-signals=
48274832
[KNL] debug: print fatal signals

‎Documentation/arch/arm64/silicon-errata.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,9 @@ stable kernels.
255255
+----------------+-----------------+-----------------+-----------------------------+
256256
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
257257
+----------------+-----------------+-----------------+-----------------------------+
258-
| Hisilicon | Hip{08,09,10,10C| #162001900 | N/A |
259-
| | ,11} SMMU PMCG | | |
258+
| Hisilicon | Hip{08,09,09A,10| #162001900 | N/A |
259+
| | ,10C,11} | | |
260+
| | SMMU PMCG | | |
260261
+----------------+-----------------+-----------------+-----------------------------+
261262
| Hisilicon | Hip09 | #162100801 | HISILICON_ERRATUM_162100801 |
262263
+----------------+-----------------+-----------------+-----------------------------+

‎Documentation/core-api/symbol-namespaces.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ is to define the default namespace in the ``Makefile`` of the subsystem. E.g. to
6868
export all symbols defined in usb-common into the namespace USB_COMMON, add a
6969
line like this to drivers/usb/common/Makefile::
7070

71-
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=USB_COMMON
71+
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE='"USB_COMMON"'
7272

7373
That will affect all EXPORT_SYMBOL() and EXPORT_SYMBOL_GPL() statements. A
7474
symbol exported with EXPORT_SYMBOL_NS() while this definition is present, will
@@ -79,7 +79,7 @@ A second option to define the default namespace is directly in the compilation
7979
unit as preprocessor statement. The above example would then read::
8080

8181
#undef DEFAULT_SYMBOL_NAMESPACE
82-
#define DEFAULT_SYMBOL_NAMESPACE USB_COMMON
82+
#define DEFAULT_SYMBOL_NAMESPACE "USB_COMMON"
8383

8484
within the corresponding compilation unit before any EXPORT_SYMBOL macro is
8585
used.
@@ -106,7 +106,7 @@ inspected with modinfo::
106106
[...]
107107

108108

109-
It is advisable to add the MODULE_IMPORT_NS("") statement close to other module
109+
It is advisable to add the MODULE_IMPORT_NS() statement close to other module
110110
metadata definitions like MODULE_AUTHOR() or MODULE_LICENSE(). Refer to section
111111
5. for a way to create missing import statements automatically.
112112

@@ -128,7 +128,7 @@ enable loading regardless, but will emit a warning.
128128
Missing namespaces imports can easily be detected at build time. In fact,
129129
modpost will emit a warning if a module uses a symbol from a namespace
130130
without importing it.
131-
MODULE_IMPORT_NS("") statements will usually be added at a definite location
131+
MODULE_IMPORT_NS() statements will usually be added at a definite location
132132
(along with other module meta data). To make the life of module authors (and
133133
subsystem maintainers) easier, a script and make target is available to fixup
134134
missing imports. Fixing missing imports can be done with::

‎Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,8 @@ allOf:
113113
maxItems: 1
114114

115115
- if:
116-
properties:
117-
compatible:
118-
contains:
119-
enum:
120-
- fsl,imx95-usb-phy
116+
required:
117+
- orientation-switch
121118
then:
122119
$ref: /schemas/usb/usb-switch.yaml#
123120

‎Documentation/devicetree/bindings/power/mediatek,power-controller.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ patternProperties:
5555
patternProperties:
5656
"^power-domain@[0-9a-f]+$":
5757
$ref: "#/$defs/power-domain-node"
58+
patternProperties:
59+
"^power-domain@[0-9a-f]+$":
60+
$ref: "#/$defs/power-domain-node"
61+
unevaluatedProperties: false
5862
unevaluatedProperties: false
5963
unevaluatedProperties: false
6064
unevaluatedProperties: false

‎Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- qcom,qca6390-pmu
21+
- qcom,wcn6750-pmu
2122
- qcom,wcn6855-pmu
2223
- qcom,wcn7850-pmu
2324

@@ -27,6 +28,9 @@ properties:
2728
vddaon-supply:
2829
description: VDD_AON supply regulator handle
2930

31+
vddasd-supply:
32+
description: VDD_ASD supply regulator handle
33+
3034
vdddig-supply:
3135
description: VDD_DIG supply regulator handle
3236

@@ -42,6 +46,9 @@ properties:
4246
vddio1p2-supply:
4347
description: VDD_IO_1P2 supply regulator handle
4448

49+
vddrfa0p8-supply:
50+
description: VDD_RFA_0P8 supply regulator handle
51+
4552
vddrfa0p95-supply:
4653
description: VDD_RFA_0P95 supply regulator handle
4754

@@ -51,12 +58,18 @@ properties:
5158
vddrfa1p3-supply:
5259
description: VDD_RFA_1P3 supply regulator handle
5360

61+
vddrfa1p7-supply:
62+
description: VDD_RFA_1P7 supply regulator handle
63+
5464
vddrfa1p8-supply:
5565
description: VDD_RFA_1P8 supply regulator handle
5666

5767
vddrfa1p9-supply:
5868
description: VDD_RFA_1P9 supply regulator handle
5969

70+
vddrfa2p2-supply:
71+
description: VDD_RFA_2P2 supply regulator handle
72+
6073
vddpcie1p3-supply:
6174
description: VDD_PCIE_1P3 supply regulator handle
6275

@@ -119,6 +132,20 @@ allOf:
119132
- vddpcie1p3-supply
120133
- vddpcie1p9-supply
121134
- vddio-supply
135+
- if:
136+
properties:
137+
compatible:
138+
contains:
139+
const: qcom,wcn6750-pmu
140+
then:
141+
required:
142+
- vddaon-supply
143+
- vddasd-supply
144+
- vddpmu-supply
145+
- vddrfa0p8-supply
146+
- vddrfa1p2-supply
147+
- vddrfa1p7-supply
148+
- vddrfa2p2-supply
122149
- if:
123150
properties:
124151
compatible:

‎Documentation/devicetree/bindings/watchdog/airoha,en7581-wdt.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/watchdog/airoha,en7581-wdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN7581 Watchdog Timer
8+
9+
maintainers:
10+
- Christian Marangi <[email protected]>
11+
12+
allOf:
13+
- $ref: watchdog.yaml#
14+
15+
properties:
16+
compatible:
17+
const: airoha,en7581-wdt
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
description: BUS clock (timer ticks at half the BUS clock)
24+
maxItems: 1
25+
26+
clock-names:
27+
const: bus
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- clock-names
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/en7523-clk.h>
40+
41+
watchdog@1fbf0100 {
42+
compatible = "airoha,en7581-wdt";
43+
reg = <0x1fbf0100 0x3c>;
44+
45+
clocks = <&scuclk EN7523_CLK_BUS>;
46+
clock-names = "bus";
47+
};

‎Documentation/devicetree/bindings/watchdog/fsl-imx-wdt.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ properties:
4848
clocks:
4949
maxItems: 1
5050

51+
big-endian: true
52+
5153
fsl,ext-reset-output:
5254
$ref: /schemas/types.yaml#/definitions/flag
5355
description: |
@@ -93,6 +95,18 @@ allOf:
9395
properties:
9496
fsl,suspend-in-wait: false
9597

98+
- if:
99+
not:
100+
properties:
101+
compatible:
102+
contains:
103+
enum:
104+
- fsl,ls1012a-wdt
105+
- fsl,ls1043a-wdt
106+
then:
107+
properties:
108+
big-endian: false
109+
96110
unevaluatedProperties: false
97111

98112
examples:

‎Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ properties:
2626
- qcom,apss-wdt-msm8994
2727
- qcom,apss-wdt-qcm2290
2828
- qcom,apss-wdt-qcs404
29+
- qcom,apss-wdt-qcs615
30+
- qcom,apss-wdt-qcs8300
2931
- qcom,apss-wdt-sa8255p
3032
- qcom,apss-wdt-sa8775p
3133
- qcom,apss-wdt-sc7180

0 commit comments

Comments
 (0)