Skip to content

Commit 6bd5e75

Browse files
author
Your Name
committed
Merge remote-tracking branch 'origin/net-next-2025-03-27--18-00' into HEAD
2 parents 0609f1e + 7b9947d commit 6bd5e75

File tree

270 files changed

+10868
-4304
lines changed

Some content is hidden

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

270 files changed

+10868
-4304
lines changed

‎.mailmap

+2-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
497497
Punit Agrawal <[email protected]> <[email protected]>
498498
Qais Yousef <[email protected]> <[email protected]>
499499
Qais Yousef <[email protected]> <[email protected]>
500-
Quentin Monnet <[email protected]> <[email protected]>
500+
Quentin Monnet <[email protected]> <[email protected]>
501+
Quentin Monnet <[email protected]> <[email protected]>
501502
Quentin Perret <[email protected]> <[email protected]>
502503
Rafael J. Wysocki <[email protected]> <[email protected]>
503504
Rajeev Nandan <[email protected]> <[email protected]>

‎Documentation/devicetree/bindings/net/airoha,en8811h.yaml

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/net/airoha,en8811h.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Airoha EN8811H PHY
8+
9+
maintainers:
10+
- Eric Woudstra <[email protected]>
11+
12+
description:
13+
The Airoha EN8811H PHY has the ability to reverse polarity
14+
on the lines to and/or from the MAC. It is reversed by
15+
the booleans in the devicetree node of the phy.
16+
17+
allOf:
18+
- $ref: ethernet-phy.yaml#
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- ethernet-phy-id03a2.a411
24+
25+
reg:
26+
maxItems: 1
27+
28+
airoha,pnswap-rx:
29+
type: boolean
30+
description:
31+
Reverse rx polarity of the SERDES. This is the receiving
32+
side of the lines from the MAC towards the EN881H.
33+
34+
airoha,pnswap-tx:
35+
type: boolean
36+
description:
37+
Reverse tx polarity of SERDES. This is the transmitting
38+
side of the lines from EN8811H towards the MAC.
39+
40+
required:
41+
- reg
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
mdio {
48+
#address-cells = <1>;
49+
#size-cells = <0>;
50+
51+
ethernet-phy@1 {
52+
compatible = "ethernet-phy-id03a2.a411";
53+
reg = <1>;
54+
airoha,pnswap-rx;
55+
};
56+
};

‎Documentation/devicetree/bindings/net/ti,icssg-prueth.yaml

+29-6
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ description:
1313
Ethernet based on the Programmable Real-Time Unit and Industrial
1414
Communication Subsystem.
1515

16-
allOf:
17-
- $ref: /schemas/remoteproc/ti,pru-consumer.yaml#
18-
1916
properties:
2017
compatible:
2118
enum:
22-
- ti,am642-icssg-prueth # for AM64x SoC family
23-
- ti,am654-icssg-prueth # for AM65x SoC family
19+
- ti,am642-icssg-prueth # for AM64x SoC family
20+
- ti,am654-icssg-prueth # for AM65x SoC family
21+
- ti,am654-sr1-icssg-prueth # for AM65x SoC family, SR1.0
2422

2523
sram:
2624
$ref: /schemas/types.yaml#/definitions/phandle
2725
description:
2826
phandle to MSMC SRAM node
2927

3028
dmas:
31-
maxItems: 10
29+
minItems: 10
30+
maxItems: 12
3231

3332
dma-names:
33+
minItems: 10
3434
items:
3535
- const: tx0-0
3636
- const: tx0-1
@@ -42,6 +42,8 @@ properties:
4242
- const: tx1-3
4343
- const: rx0
4444
- const: rx1
45+
- const: rxmgm0
46+
- const: rxmgm1
4547

4648
ti,mii-g-rt:
4749
$ref: /schemas/types.yaml#/definitions/phandle
@@ -132,6 +134,27 @@ required:
132134
- interrupts
133135
- interrupt-names
134136

137+
allOf:
138+
- $ref: /schemas/remoteproc/ti,pru-consumer.yaml#
139+
140+
- if:
141+
properties:
142+
compatible:
143+
contains:
144+
const: ti,am654-sr1-icssg-prueth
145+
then:
146+
properties:
147+
dmas:
148+
minItems: 12
149+
dma-names:
150+
minItems: 12
151+
else:
152+
properties:
153+
dmas:
154+
maxItems: 10
155+
dma-names:
156+
maxItems: 10
157+
135158
unevaluatedProperties: false
136159

137160
examples:

‎Documentation/mm/page_frags.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ to be disabled when executing the fragment allocation.
2525
The network stack uses two separate caches per CPU to handle fragment
2626
allocation. The netdev_alloc_cache is used by callers making use of the
2727
netdev_alloc_frag and __netdev_alloc_skb calls. The napi_alloc_cache is
28-
used by callers of the __napi_alloc_frag and __napi_alloc_skb calls. The
28+
used by callers of the __napi_alloc_frag and napi_alloc_skb calls. The
2929
main difference between these two calls is the context in which they may be
3030
called. The "netdev" prefixed functions are usable in any context as these
3131
functions will disable interrupts, while the "napi" prefixed functions are

‎Documentation/netlink/specs/rt_link.yaml

+78-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ definitions:
5050
name: dormant
5151
-
5252
name: echo
53-
53+
-
54+
name: vlan-protocols
55+
type: enum
56+
entries:
57+
-
58+
name: 8021q
59+
value: 33024
60+
-
61+
name: 8021ad
62+
value: 34984
5463
-
5564
name: rtgenmsg
5665
type: struct
@@ -729,7 +738,38 @@ definitions:
729738
-
730739
name: filter-mask
731740
type: u32
732-
741+
-
742+
name: ifla-vlan-flags
743+
type: struct
744+
members:
745+
-
746+
name: flags
747+
type: u32
748+
enum: vlan-flags
749+
enum-as-flags: true
750+
-
751+
name: mask
752+
type: u32
753+
display-hint: hex
754+
-
755+
name: vlan-flags
756+
type: flags
757+
entries:
758+
- reorder-hdr
759+
- gvrp
760+
- loose-binding
761+
- mvrp
762+
- bridge-binding
763+
-
764+
name: ifla-vlan-qos-mapping
765+
type: struct
766+
members:
767+
-
768+
name: from
769+
type: u32
770+
-
771+
name: to
772+
type: u32
733773

734774
attribute-sets:
735775
-
@@ -1507,6 +1547,39 @@ attribute-sets:
15071547
-
15081548
name: num-disabled-queues
15091549
type: u32
1550+
-
1551+
name: linkinfo-vlan-attrs
1552+
name-prefix: ifla-vlan-
1553+
attributes:
1554+
-
1555+
name: id
1556+
type: u16
1557+
-
1558+
name: flag
1559+
type: binary
1560+
struct: ifla-vlan-flags
1561+
-
1562+
name: egress-qos
1563+
type: nest
1564+
nested-attributes: ifla-vlan-qos
1565+
-
1566+
name: ingress-qos
1567+
type: nest
1568+
nested-attributes: ifla-vlan-qos
1569+
-
1570+
name: protocol
1571+
type: u16
1572+
enum: vlan-protocols
1573+
byte-order: big-endian
1574+
-
1575+
name: ifla-vlan-qos
1576+
name-prefix: ifla-vlan-qos
1577+
attributes:
1578+
-
1579+
name: mapping
1580+
type: binary
1581+
multi-attr: true
1582+
struct: ifla-vlan-qos-mapping
15101583
-
15111584
name: linkinfo-vrf-attrs
15121585
name-prefix: ifla-vrf-
@@ -1666,6 +1739,9 @@ sub-messages:
16661739
-
16671740
value: tun
16681741
attribute-set: linkinfo-tun-attrs
1742+
-
1743+
value: vlan
1744+
attribute-set: linkinfo-vlan-attrs
16691745
-
16701746
value: vrf
16711747
attribute-set: linkinfo-vrf-attrs

‎Documentation/netlink/specs/tc.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -1099,6 +1099,19 @@ definitions:
10991099
-
11001100
name: offmask
11011101
type: s32
1102+
-
1103+
name: tc-u32-mark
1104+
type: struct
1105+
members:
1106+
-
1107+
name: val
1108+
type: u32
1109+
-
1110+
name: mask
1111+
type: u32
1112+
-
1113+
name: success
1114+
type: u32
11021115
-
11031116
name: tc-u32-sel
11041117
type: struct
@@ -1774,6 +1787,44 @@ attribute-sets:
17741787
-
17751788
name: key-ex
17761789
type: binary
1790+
-
1791+
name: tc-act-police-attrs
1792+
attributes:
1793+
-
1794+
name: tbf
1795+
type: binary
1796+
struct: tc-police
1797+
-
1798+
name: rate
1799+
type: binary # TODO
1800+
-
1801+
name: peakrate
1802+
type: binary # TODO
1803+
-
1804+
name: avrate
1805+
type: u32
1806+
-
1807+
name: result
1808+
type: u32
1809+
-
1810+
name: tm
1811+
type: binary
1812+
struct: tcf-t
1813+
-
1814+
name: pad
1815+
type: pad
1816+
-
1817+
name: rate64
1818+
type: u64
1819+
-
1820+
name: peakrate64
1821+
type: u64
1822+
-
1823+
name: pktrate64
1824+
type: u64
1825+
-
1826+
name: pktburst64
1827+
type: u64
17771828
-
17781829
name: tc-act-simple-attrs
17791830
attributes:

0 commit comments

Comments
 (0)