Commit 2483e7f0 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/stmicro/stmmac/dwmac5.c
drivers/net/ethernet/stmicro/stmmac/dwmac5.h
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
drivers/net/ethernet/stmicro/stmmac/hwif.h
  37e4b8df ("net: stmmac: fix FPE events losing")
  c3f3b972 ("net: stmmac: Refactor EST implementation")
https://lore.kernel.org/all/20231206110306.01e91114@canb.auug.org.au/



Adjacent changes:

net/ipv4/tcp_ao.c
  9396c4ee ("net/tcp: Don't store TCP-AO maclen on reqsk")
  7b0f570f ("tcp: Move TCP-AO bits from cookie_v[46]_check() to tcp_ao_syncookie().")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 87e839c8 5e3f5b81

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders 
maintainers:

  - Laurent Pinchart <laurent.pinchart@ideasonboard.com>



allOf:

  - $ref: /schemas/sound/dai-common.yaml#



description: |

  The ADV7533 and ADV7535 are HDMI audio and video transmitters

  compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [ 1, 2, 3, 4 ]



  "#sound-dai-cells":

    const: 0



  ports:

    description:

      The ADV7533/35 has two video ports and one audio port.

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

+19 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ properties: 
    minItems: 1



  interrupts:

    maxItems: 1

    items:

      - description: LCDIF DMA interrupt

      - description: LCDIF Error interrupt

    minItems: 1



  power-domains:

    maxItems: 1
@@ -131,6 +134,21 @@ allOf: 
    then:

      required:

        - power-domains

  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx23-lcdif

    then:

      properties:

        interrupts:

          minItems: 2

          maxItems: 2

    else:

      properties:

        interrupts:

          maxItems: 1



examples:

  - |

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ maintainers: 
  - Chun-Kuang Hu <chunkuang.hu@kernel.org>

  - Philipp Zabel <p.zabel@pengutronix.de>

  - Jitao Shi <jitao.shi@mediatek.com>

  - Xinlei Lee <xinlei.lee@mediatek.com>



description: |

  The MediaTek DSI function block is a sink of the display subsystem and can

Documentation/devicetree/bindings/interrupt-controller/qcom,mpm.yaml

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ properties: 
        - description: MPM pin number

        - description: GIC SPI number for the MPM pin



  '#power-domain-cells':

    const: 0



required:

  - compatible

  - reg
@@ -93,4 +96,5 @@ examples: 
                           <86 183>,

                           <90 260>,

                           <91 260>;

        #power-domain-cells = <0>;

    };

Documentation/networking/tcp_ao.rst

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ also [6.1]:: 
   when it is no longer considered permitted.



Linux TCP-AO will try its best to prevent you from removing a key that's

being used, considering it a key management failure. But sine keeping

being used, considering it a key management failure. But since keeping

an outdated key may become a security issue and as a peer may

unintentionally prevent the removal of an old key by always setting

it as RNextKeyID - a forced key removal mechanism is provided, where