Commit 5c496ff1 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge commit '71f0dd5a' of... 

Merge commit '71f0dd5a' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next into for-6.15/io_uring-rx-zc

Merge networking zerocopy receive tree, to get the prep patches for
the io_uring rx zc support.

* git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (63 commits)
  net: add helpers for setting a memory provider on an rx queue
  net: page_pool: add memory provider helpers
  net: prepare for non devmem TCP memory providers
  net: page_pool: add a mp hook to unregister_netdevice*
  net: page_pool: add callback for mp info printing
  netdev: add io_uring memory provider info
  net: page_pool: create hooks for custom memory providers
  net: generalise net_iov chunk owners
  net: prefix devmem specific helpers
  net: page_pool: don't cast mp param to devmem
  tools: ynl: add all headers to makefile deps
  eth: fbnic: set IFF_UNICAST_FLT to avoid enabling promiscuous mode when adding unicast addrs
  eth: fbnic: add MAC address TCAM to debugfs
  tools: ynl-gen: support limits using definitions
  tools: ynl-gen: don't output external constants
  net/mlx5e: Avoid WARN_ON when configuring MQPRIO with HTB offload enabled
  net/mlx5e: Remove unused mlx5e_tc_flow_action struct
  net/mlx5: Remove stray semicolon in LAG port selection table creation
  net/mlx5e: Support FEC settings for 200G per lane link modes
  net/mlx5: Add support for 200Gbps per lane link modes
  ...
parents 94a4274b 71f0dd5a

Documentation/arch/s390/driver-model.rst

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ information about the interrupt from the irb parameter. 
--------------------



The ccwgroup mechanism is designed to handle devices consisting of multiple ccw

devices, like lcs or ctc.

devices, like qeth or ctc.



The ccw driver provides a 'group' attribute. Piping bus ids of ccw devices to

this attributes creates a ccwgroup device consisting of these ccw devices (if

Documentation/devicetree/bindings/net/faraday,ftgmac100.yaml

+3 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ properties: 
  phy-mode:

    enum:

      - rgmii

      - rgmii-id

      - rgmii-rxid

      - rgmii-txid

      - rmii



  phy-handle: true

Documentation/netlink/genetlink-c.yaml

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ $defs: 
    pattern: ^[0-9A-Za-z_-]+( - 1)?$

    minimum: 0

  len-or-limit:

    # literal int or limit based on fixed-width type e.g. u8-min, u16-max, etc.

    # literal int, const name, or limit based on fixed-width type

    # e.g. u8-min, u16-max, etc.

    type: [ string, integer ]

    pattern: ^[su](8|16|32|64)-(min|max)$

    pattern: ^[0-9A-Za-z_-]+$

    minimum: 0



# Schema for specs

Documentation/netlink/genetlink-legacy.yaml

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ $defs: 
    pattern: ^[0-9A-Za-z_-]+( - 1)?$

    minimum: 0

  len-or-limit:

    # literal int or limit based on fixed-width type e.g. u8-min, u16-max, etc.

    # literal int, const name, or limit based on fixed-width type

    # e.g. u8-min, u16-max, etc.

    type: [ string, integer ]

    pattern: ^[su](8|16|32|64)-(min|max)$

    pattern: ^[0-9A-Za-z_-]+$

    minimum: 0



# Schema for specs

Documentation/netlink/genetlink.yaml

+3 −2
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ $defs: 
    pattern: ^[0-9A-Za-z_-]+( - 1)?$

    minimum: 0

  len-or-limit:

    # literal int or limit based on fixed-width type e.g. u8-min, u16-max, etc.

    # literal int, const name, or limit based on fixed-width type

    # e.g. u8-min, u16-max, etc.

    type: [ string, integer ]

    pattern: ^[su](8|16|32|64)-(min|max)$

    pattern: ^[0-9A-Za-z_-]+$

    minimum: 0



# Schema for specs