Skip to content

Commit 111fb5f

Browse files
committed
Merge branch 'bpf-next/net' into bpf-next/for-next
No conflicts. Signed-off-by: Daniel Borkmann <[email protected]>
2 parents c4b767f + f8fdda9 commit 111fb5f

File tree

446 files changed

+15354
-3122
lines changed

Some content is hidden

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

446 files changed

+15354
-3122
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*.dwo
2525
*.elf
2626
*.gcno
27+
*.gcda
2728
*.gz
2829
*.i
2930
*.ko

Documentation/dev-tools/gcov.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,17 @@ Only files which are linked to the main kernel image or are compiled as
7575
kernel modules are supported by this mechanism.
7676

7777

78+
Module specific configs
79+
-----------------------
80+
81+
Gcov kernel configs for specific modules are described below:
82+
83+
CONFIG_GCOV_PROFILE_RDS:
84+
Enables GCOV profiling on RDS for checking which functions or
85+
lines are executed. This config is used by the rds selftest to
86+
generate coverage reports. If left unset the report is omitted.
87+
88+
7889
Files
7990
-----
8091

Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ properties:
5151
Set if the output SYNCLKO clock should be disabled. Do not mix with
5252
microchip,synclko-125.
5353

54+
microchip,pme-active-high:
55+
$ref: /schemas/types.yaml#/definitions/flag
56+
description:
57+
Indicates if the PME pin polarity is active-high.
58+
5459
microchip,io-drive-strength-microamp:
5560
description:
5661
IO Pad Drive Strength

Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,20 @@ properties:
2424
maxItems: 1
2525
description: The DPMAC number
2626

27-
phy-handle: true
28-
29-
phy-connection-type: true
30-
31-
phy-mode: true
32-
3327
pcs-handle:
3428
maxItems: 1
3529
description:
3630
A reference to a node representing a PCS PHY device found on
3731
the internal MDIO bus.
3832

39-
managed: true
40-
4133
phys:
4234
description: A reference to the SerDes lane(s)
4335
maxItems: 1
4436

4537
required:
4638
- reg
4739

48-
additionalProperties: false
40+
unevaluatedProperties: false
4941

5042
examples:
5143
- |

Documentation/devicetree/bindings/net/mdio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description:
1919

2020
properties:
2121
$nodename:
22-
pattern: "^mdio(@.*)?"
22+
pattern: '^mdio(-(bus|external))?(@.+|-([0-9]+))?$'
2323

2424
"#address-cells":
2525
const: 1

Documentation/devicetree/bindings/net/mediatek,net.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,13 @@ properties:
3030
reg:
3131
maxItems: 1
3232

33-
clocks: true
34-
clock-names: true
33+
clocks:
34+
minItems: 2
35+
maxItems: 24
36+
37+
clock-names:
38+
minItems: 2
39+
maxItems: 24
3540

3641
interrupts:
3742
minItems: 1
@@ -127,6 +132,7 @@ allOf:
127132
then:
128133
properties:
129134
interrupts:
135+
minItems: 3
130136
maxItems: 3
131137

132138
clocks:
@@ -183,6 +189,7 @@ allOf:
183189
then:
184190
properties:
185191
interrupts:
192+
minItems: 3
186193
maxItems: 3
187194

188195
clocks:
@@ -222,6 +229,7 @@ allOf:
222229
then:
223230
properties:
224231
interrupts:
232+
minItems: 3
225233
maxItems: 3
226234

227235
clocks:

Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ properties:
2323
'#pse-cells':
2424
const: 1
2525

26+
reset-gpios:
27+
maxItems: 1
28+
2629
channels:
2730
description: each set of 8 ports can be assigned to one physical
2831
channels or two for PoE4. This parameter describes the configuration

Documentation/devicetree/bindings/net/renesas,etheravb.yaml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,27 @@ properties:
6262
- renesas,r9a08g045-gbeth # RZ/G3S
6363
- const: renesas,rzg2l-gbeth # RZ/{G2L,G2UL,V2L} family
6464

65-
reg: true
65+
reg:
66+
minItems: 1
67+
items:
68+
- description: MAC register block
69+
- description: Stream buffer
6670

67-
interrupts: true
71+
interrupts:
72+
minItems: 1
73+
maxItems: 29
6874

69-
interrupt-names: true
75+
interrupt-names:
76+
minItems: 1
77+
maxItems: 29
7078

71-
clocks: true
79+
clocks:
80+
minItems: 1
81+
maxItems: 3
7282

73-
clock-names: true
83+
clock-names:
84+
minItems: 1
85+
maxItems: 3
7486

7587
iommus:
7688
maxItems: 1
@@ -150,14 +162,11 @@ allOf:
150162
then:
151163
properties:
152164
reg:
153-
items:
154-
- description: MAC register block
155-
- description: Stream buffer
165+
minItems: 2
156166
else:
157167
properties:
158168
reg:
159-
items:
160-
- description: MAC register block
169+
maxItems: 1
161170

162171
- if:
163172
properties:

Documentation/devicetree/bindings/net/socionext,uniphier-ave4.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,17 @@ properties:
4141
minItems: 1
4242
maxItems: 4
4343

44-
clock-names: true
44+
clock-names:
45+
minItems: 1
46+
maxItems: 4
4547

4648
resets:
4749
minItems: 1
4850
maxItems: 2
4951

50-
reset-names: true
52+
reset-names:
53+
minItems: 1
54+
maxItems: 2
5155

5256
socionext,syscon-phy-mode:
5357
$ref: /schemas/types.yaml#/definitions/phandle-array

Documentation/devicetree/bindings/ptp/fsl,ptp.yaml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
enum:
15-
- fsl,etsec-ptp
16-
- fsl,fman-ptp-timer
17-
- fsl,dpaa2-ptp
18-
- fsl,enetc-ptp
14+
oneOf:
15+
- enum:
16+
- fsl,etsec-ptp
17+
- fsl,fman-ptp-timer
18+
- fsl,dpaa2-ptp
19+
- items:
20+
- const: pci1957,ee02
21+
- const: fsl,enetc-ptp
1922

2023
reg:
2124
maxItems: 1
@@ -123,6 +126,15 @@ required:
123126
- compatible
124127
- reg
125128

129+
allOf:
130+
- if:
131+
properties:
132+
compatible:
133+
contains:
134+
const: fsl,enetc-ptp
135+
then:
136+
$ref: /schemas/pci/pci-device.yaml
137+
126138
additionalProperties: false
127139

128140
examples:

0 commit comments

Comments
 (0)