Commit 82b4a941 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

net/core/gro.c
  7d2c89b3 ("skb: Do mix page pool and page referenced frags in GRO")
  b1a78b9b ("net: add support for ipv4 big tcp")
https://lore.kernel.org/all/20230203094454.5766f160@canb.auug.org.au/



Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b18ea3d9 edb9b8f3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ Jisheng Zhang <jszhang@kernel.org> <jszhang@marvell.com> 
Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>

Johan Hovold <johan@kernel.org> <jhovold@gmail.com>

Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>

John Crispin <john@phrozen.org> <blogic@openwrt.org>

John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

John Stultz <johnstul@us.ibm.com>

Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,10 @@ D: Future Domain TMC-16x0 SCSI driver (author) 
D: APM driver (early port)

D: DRM drivers (author of several)



N: Veaceslav Falico

E: vfalico@gmail.com

D: Co-maintainer and co-author of the network bonding driver.



N: János Farkas

E: chexum@shadow.banki.hu

D: romfs, various (mostly networking) fixes
@@ -4179,6 +4183,10 @@ S: B-1206 Jingmao Guojigongyu 
S: 16 Baliqiao Nanjie, Beijing 101100

S: People's Repulic of China



N: Vlad Yasevich

E: vyasevich@gmail.com

D: SCTP protocol maintainer.



N: Aviad Yehezkel

E: aviadye@nvidia.com

D: Kernel TLS implementation and offload support.

Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ properties: 
  compatible:

    items:

      - enum:

          - renesas,i2c-r9a09g011  # RZ/V2M

          - renesas,r9a09g011-i2c  # RZ/V2M

      - const: renesas,rzv2m-i2c



  reg:
@@ -66,7 +66,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/arm-gic.h>



    i2c0: i2c@a4030000 {

        compatible = "renesas,i2c-r9a09g011", "renesas,rzv2m-i2c";

        compatible = "renesas,r9a09g011-i2c", "renesas,rzv2m-i2c";

        reg = <0xa4030000 0x80>;

        interrupts = <GIC_SPI 232 IRQ_TYPE_EDGE_RISING>,

                     <GIC_SPI 236 IRQ_TYPE_EDGE_RISING>;

Documentation/devicetree/bindings/regulator/samsung,s2mps14.yaml

+19 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ description: | 
  additional information and example.



patternProperties:

  # 25 LDOs

  "^LDO([1-9]|[1][0-9]|2[0-5])$":

  # 25 LDOs, without LDO10-12

  "^LDO([1-9]|1[3-9]|2[0-5])$":

    type: object

    $ref: regulator.yaml#

    unevaluatedProperties: false
@@ -30,6 +30,23 @@ patternProperties: 
    required:

      - regulator-name



  "^LDO(1[0-2])$":

    type: object

    $ref: regulator.yaml#

    unevaluatedProperties: false

    description:

      Properties for single LDO regulator.



    properties:

      samsung,ext-control-gpios:

        maxItems: 1

        description:

          LDO10, LDO11 and LDO12 can be configured to external control over

          GPIO.



    required:

      - regulator-name



  # 5 bucks

  "^BUCK[1-5]$":

    type: object

Documentation/devicetree/bindings/riscv/cpus.yaml

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ properties: 
      insensitive, letters in the riscv,isa string must be all

      lowercase to simplify parsing.

    $ref: "/schemas/types.yaml#/definitions/string"

    pattern: ^rv(?:64|32)imaf?d?q?c?b?v?k?h?(?:_[hsxz](?:[a-z])+)*$

    pattern: ^rv(?:64|32)imaf?d?q?c?b?k?j?p?v?h?(?:[hsxz](?:[a-z])+)?(?:_[hsxz](?:[a-z])+)*$



  # RISC-V requires 'timebase-frequency' in /cpus, so disallow it here

  timebase-frequency: false