Skip to content

Commit a71aae6

Browse files
author
Your Name
committed
Merge branch 'net-next-2024-03-29--18-00' into HEAD
2 parents 9325308 + 8207996 commit a71aae6

File tree

328 files changed

+8185
-2479
lines changed

Some content is hidden

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

328 files changed

+8185
-2479
lines changed

‎Documentation/conf.py

+2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ def have_command(cmd):
7575
"__rcu",
7676
"__user",
7777
"__force",
78+
"__counted_by_le",
79+
"__counted_by_be",
7880

7981
# include/linux/compiler_attributes.h:
8082
"__alias",

‎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/bluetooth/qualcomm-bluetooth.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ properties:
9494

9595
local-bd-address: true
9696

97+
qcom,local-bd-address-broken:
98+
type: boolean
99+
description:
100+
boot firmware is incorrectly passing the address in big-endian order
97101

98102
required:
99103
- compatible

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

‎Documentation/netlink/specs/team.yaml

+204
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
2+
3+
name: team
4+
5+
protocol: genetlink-legacy
6+
7+
doc: |
8+
Network team device driver.
9+
10+
c-family-name: team-genl-name
11+
c-version-name: team-genl-version
12+
kernel-policy: global
13+
uapi-header: linux/if_team.h
14+
15+
definitions:
16+
-
17+
name: string-max-len
18+
type: const
19+
value: 32
20+
-
21+
name: genl-change-event-mc-grp-name
22+
type: const
23+
value: change_event
24+
25+
attribute-sets:
26+
-
27+
name: team
28+
doc:
29+
The team nested layout of get/set msg looks like
30+
[TEAM_ATTR_LIST_OPTION]
31+
[TEAM_ATTR_ITEM_OPTION]
32+
[TEAM_ATTR_OPTION_*], ...
33+
[TEAM_ATTR_ITEM_OPTION]
34+
[TEAM_ATTR_OPTION_*], ...
35+
...
36+
[TEAM_ATTR_LIST_PORT]
37+
[TEAM_ATTR_ITEM_PORT]
38+
[TEAM_ATTR_PORT_*], ...
39+
[TEAM_ATTR_ITEM_PORT]
40+
[TEAM_ATTR_PORT_*], ...
41+
...
42+
name-prefix: team-attr-
43+
attributes:
44+
-
45+
name: unspec
46+
type: unused
47+
value: 0
48+
-
49+
name: team-ifindex
50+
type: u32
51+
-
52+
name: list-option
53+
type: nest
54+
nested-attributes: item-option
55+
-
56+
name: list-port
57+
type: nest
58+
nested-attributes: item-port
59+
-
60+
name: item-option
61+
name-prefix: team-attr-item-
62+
attr-cnt-name: __team-attr-item-option-max
63+
attr-max-name: team-attr-item-option-max
64+
attributes:
65+
-
66+
name: option-unspec
67+
type: unused
68+
value: 0
69+
-
70+
name: option
71+
type: nest
72+
nested-attributes: attr-option
73+
-
74+
name: attr-option
75+
name-prefix: team-attr-option-
76+
attributes:
77+
-
78+
name: unspec
79+
type: unused
80+
value: 0
81+
-
82+
name: name
83+
type: string
84+
checks:
85+
max-len: string-max-len
86+
unterminated-ok: true
87+
-
88+
name: changed
89+
type: flag
90+
-
91+
name: type
92+
type: u8
93+
-
94+
name: data
95+
type: binary
96+
-
97+
name: removed
98+
type: flag
99+
-
100+
name: port-ifindex
101+
type: u32
102+
doc: for per-port options
103+
-
104+
name: array-index
105+
type: u32
106+
doc: for array options
107+
-
108+
name: item-port
109+
name-prefix: team-attr-item-
110+
attr-cnt-name: __team-attr-item-port-max
111+
attr-max-name: team-attr-item-port-max
112+
attributes:
113+
-
114+
name: port-unspec
115+
type: unused
116+
value: 0
117+
-
118+
name: port
119+
type: nest
120+
nested-attributes: attr-port
121+
-
122+
name: attr-port
123+
name-prefix: team-attr-port-
124+
attributes:
125+
-
126+
name: unspec
127+
type: unused
128+
value: 0
129+
-
130+
name: ifindex
131+
type: u32
132+
-
133+
name: changed
134+
type: flag
135+
-
136+
name: linkup
137+
type: flag
138+
-
139+
name: speed
140+
type: u32
141+
-
142+
name: duplex
143+
type: u8
144+
-
145+
name: removed
146+
type: flag
147+
148+
operations:
149+
list:
150+
-
151+
name: noop
152+
doc: No operation
153+
value: 0
154+
attribute-set: team
155+
dont-validate: [ strict ]
156+
157+
do:
158+
# Actually it only reply the team netlink family
159+
reply:
160+
attributes:
161+
- team-ifindex
162+
163+
-
164+
name: options-set
165+
doc: Set team options
166+
attribute-set: team
167+
dont-validate: [ strict ]
168+
flags: [ admin-perm ]
169+
170+
do:
171+
request: &option_attrs
172+
attributes:
173+
- team-ifindex
174+
- list-option
175+
reply: *option_attrs
176+
177+
-
178+
name: options-get
179+
doc: Get team options info
180+
attribute-set: team
181+
dont-validate: [ strict ]
182+
flags: [ admin-perm ]
183+
184+
do:
185+
request:
186+
attributes:
187+
- team-ifindex
188+
reply: *option_attrs
189+
190+
-
191+
name: port-list-get
192+
doc: Get team ports info
193+
attribute-set: team
194+
dont-validate: [ strict ]
195+
flags: [ admin-perm ]
196+
197+
do:
198+
request:
199+
attributes:
200+
- team-ifindex
201+
reply: &port_attrs
202+
attributes:
203+
- team-ifindex
204+
- list-port

0 commit comments

Comments
 (0)