Skip to content

Commit

Permalink
Merge branch 'net-next-2024-03-29--15-00' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
Your Name committed Mar 29, 2024
2 parents 9325308 + 4cb6429 commit c8c7b2f
Show file tree
Hide file tree
Showing 316 changed files with 9,685 additions and 2,456 deletions.
2 changes: 2 additions & 0 deletions Documentation/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ def have_command(cmd):
"__rcu",
"__user",
"__force",
"__counted_by_le",
"__counted_by_be",

# include/linux/compiler_attributes.h:
"__alias",
Expand Down
56 changes: 56 additions & 0 deletions Documentation/devicetree/bindings/net/airoha,en8811h.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/net/airoha,en8811h.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Airoha EN8811H PHY

maintainers:
- Eric Woudstra <ericwouds@gmail.com>

description:
The Airoha EN8811H PHY has the ability to reverse polarity
on the lines to and/or from the MAC. It is reversed by
the booleans in the devicetree node of the phy.

allOf:
- $ref: ethernet-phy.yaml#

properties:
compatible:
enum:
- ethernet-phy-id03a2.a411

reg:
maxItems: 1

airoha,pnswap-rx:
type: boolean
description:
Reverse rx polarity of the SERDES. This is the receiving
side of the lines from the MAC towards the EN881H.

airoha,pnswap-tx:
type: boolean
description:
Reverse tx polarity of SERDES. This is the transmitting
side of the lines from EN8811H towards the MAC.

required:
- reg

unevaluatedProperties: false

examples:
- |
mdio {
#address-cells = <1>;
#size-cells = <0>;
ethernet-phy@1 {
compatible = "ethernet-phy-id03a2.a411";
reg = <1>;
airoha,pnswap-rx;
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ properties:

local-bd-address: true

qcom,local-bd-address-broken:
type: boolean
description:
boot firmware is incorrectly passing the address in big-endian order

required:
- compatible
Expand Down
2 changes: 1 addition & 1 deletion Documentation/mm/page_frags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ to be disabled when executing the fragment allocation.
The network stack uses two separate caches per CPU to handle fragment
allocation. The netdev_alloc_cache is used by callers making use of the
netdev_alloc_frag and __netdev_alloc_skb calls. The napi_alloc_cache is
used by callers of the __napi_alloc_frag and __napi_alloc_skb calls. The
used by callers of the __napi_alloc_frag and napi_alloc_skb calls. The
main difference between these two calls is the context in which they may be
called. The "netdev" prefixed functions are usable in any context as these
functions will disable interrupts, while the "napi" prefixed functions are
Expand Down
Loading

0 comments on commit c8c7b2f

Please sign in to comment.