Commit 91afa49a authored by Paolo Abeni's avatar Paolo Abeni
Browse files

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



Cross-merge networking fixes after downstream PR (net-6.12-rc4).

Conflicts:

107a034d ("net/mlx5: qos: Store rate groups in a qos domain")
1da9cfd6 ("net/mlx5: Unregister notifier on eswitch init failure")

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 906c6865 07d6bf63

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ Felix Moeller <felix@derklecks.de> 
Fenglin Wu <quic_fenglinw@quicinc.com> <fenglinw@codeaurora.org>

Filipe Lautert <filipe@icewall.org>

Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>

Fiona Behrens <me@kloenk.dev>

Fiona Behrens <me@kloenk.dev> <me@kloenk.de>

Fiona Behrens <me@kloenk.dev> <fin@nyantec.com>

Franck Bui-Huu <vagabon.xyz@gmail.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>

Frank Rowand <frowand.list@gmail.com> <frank.rowand@sony.com>

Documentation/devicetree/bindings/display/elgin,jg10309-01.yaml

0 → 100644
+54 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/display/elgin,jg10309-01.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Elgin JG10309-01 SPI-controlled display



maintainers:

  - Fabio Estevam <festevam@gmail.com>



description: |

  The Elgin JG10309-01 SPI-controlled display is used on the RV1108-Elgin-r1

  board and is a custom display.



allOf:

  - $ref: /schemas/spi/spi-peripheral-props.yaml#



properties:

  compatible:

    const: elgin,jg10309-01



  reg:

    maxItems: 1



  spi-max-frequency:

    maximum: 24000000



  spi-cpha: true



  spi-cpol: true



required:

  - compatible

  - reg

  - spi-cpha

  - spi-cpol



additionalProperties: false



examples:

  - |

    spi {

        #address-cells = <1>;

        #size-cells = <0>;



        display@0 {

            compatible = "elgin,jg10309-01";

            reg = <0>;

            spi-max-frequency = <24000000>;

            spi-cpha;

            spi-cpol;

        };

    };

Documentation/devicetree/bindings/interrupt-controller/fsl,ls-extirq.yaml

+23 −3
Original line number Diff line number Diff line
@@ -82,9 +82,6 @@ allOf: 
            enum:

              - fsl,ls1043a-extirq

              - fsl,ls1046a-extirq

              - fsl,ls1088a-extirq

              - fsl,ls2080a-extirq

              - fsl,lx2160a-extirq

    then:

      properties:

        interrupt-map:
@@ -95,6 +92,29 @@ allOf: 
            - const: 0xf

            - const: 0



  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,ls1088a-extirq

              - fsl,ls2080a-extirq

              - fsl,lx2160a-extirq

# The driver(drivers/irqchip/irq-ls-extirq.c) have not use standard DT

# function to parser interrupt-map. So it doesn't consider '#address-size'

# in parent interrupt controller, such as GIC.

#

# When dt-binding verify interrupt-map, item data matrix is spitted at

# incorrect position. Remove interrupt-map restriction because it always

# wrong.



    then:

      properties:

        interrupt-map-mask:

          items:

            - const: 0xf

            - const: 0



additionalProperties: false



examples:

Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ properties: 


  msi-parent:

    deprecated: true

    $ref: /schemas/types.yaml#/definitions/phandle

    maxItems: 1

    description:

      Describes the MSI controller node handling message

      interrupts for the MC. When there is no translation

Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - brcm,asp-v2.1-mdio

      - brcm,asp-v2.2-mdio

      - brcm,unimac-mdio

      - brcm,bcm6846-mdio



  reg:

    minItems: 1