Skip to content

Commit c8c7b2f

Browse files
author
Your Name
committed
Merge branch 'net-next-2024-03-29--15-00' into HEAD
2 parents 9325308 + 4cb6429 commit c8c7b2f

File tree

316 files changed

+9685
-2456
lines changed

Some content is hidden

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

316 files changed

+9685
-2456
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",
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

0 commit comments

Comments
 (0)