Commit 78b6f6e9 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-6.15/io_uring-rx-zc' into for-6.15/io_uring-reg-vec 

* for-6.15/io_uring-rx-zc: (80 commits)
  io_uring/zcrx: add selftest case for recvzc with read limit
  io_uring/zcrx: add a read limit to recvzc requests
  io_uring: add missing IORING_MAP_OFF_ZCRX_REGION in io_uring_mmap
  io_uring: Rename KConfig to Kconfig
  io_uring/zcrx: fix leaks on failed registration
  io_uring/zcrx: recheck ifq on shutdown
  io_uring/zcrx: add selftest
  net: add documentation for io_uring zcrx
  io_uring/zcrx: add copy fallback
  io_uring/zcrx: throttle receive requests
  io_uring/zcrx: set pp memory provider for an rx queue
  io_uring/zcrx: add io_recvzc request
  io_uring/zcrx: dma-map area for the device
  io_uring/zcrx: implement zerocopy receive pp memory provider
  io_uring/zcrx: grab a net device
  io_uring/zcrx: add io_zcrx_area
  io_uring/zcrx: add interface queue and refill queue
  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
  ...
parents 94765d71 89baa22d

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