Commit 2696e451 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 (net-6.12-rc7).

Conflicts:

drivers/net/ethernet/freescale/enetc/enetc_pf.c
  e15c5506 ("net: enetc: allocate vf_state during PF probes")
  3774409f ("net: enetc: build enetc_pf_common.c as a separate module")
https://lore.kernel.org/20241105114100.118bd35e@canb.auug.org.au



Adjacent changes:

drivers/net/ethernet/ti/am65-cpsw-nuss.c
  de794169 ("net: ethernet: ti: am65-cpsw: Fix multi queue Rx on J7")
  4a7b2ba9 ("net: ethernet: ti: am65-cpsw: Use tstats instead of open coded version")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 702c290a bfc64d9b

.mailmap

+3 −2
Original line number Diff line number Diff line
@@ -199,7 +199,8 @@ Elliot Berman <quic_eberman@quicinc.com> <eberman@codeaurora.org> 
Enric Balletbo i Serra <eballetbo@kernel.org> <enric.balletbo@collabora.com>

Enric Balletbo i Serra <eballetbo@kernel.org> <eballetbo@iseebcn.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@microchip.com>

Eugen Hristev <eugen.hristev@linaro.org> <eugen.hristev@collabora.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Faith Ekstrand <faith.ekstrand@collabora.com> <jason@jlekstrand.net>
@@ -282,7 +283,7 @@ Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com> 
Jan Kuliga <jtkuliga.kdev@gmail.com> <jankul@alatek.krakow.pl>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@linux.intel.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko@profian.com>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@tuni.fi>

Jarkko Sakkinen <jarkko@kernel.org> <jarkko.sakkinen@parity.io>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@nvidia.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1204,6 +1204,10 @@ S: Dreisbachstrasse 24 
S: D-57250 Netphen

S: Germany



N: Florian Fainelli

E: f.fainelli@gmail.com

D: DSA



N: Rik Faith

E: faith@acm.org

D: Future Domain TMC-16x0 SCSI driver (author)

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

+10 −14
Original line number Diff line number Diff line
@@ -63,6 +63,16 @@ properties: 
      - const: sleep



  power-domains:

    description: |

      The MediaTek DPI module is typically associated with one of the

      following multimedia power domains:

        POWER_DOMAIN_DISPLAY

        POWER_DOMAIN_VDOSYS

        POWER_DOMAIN_MM

      The specific power domain used varies depending on the SoC design.



      It is recommended to explicitly add the appropriate power domain

      property to the DPI node in the device tree.

    maxItems: 1



  port:
@@ -79,20 +89,6 @@ required: 
  - clock-names

  - port



allOf:

  - if:

      not:

        properties:

          compatible:

            contains:

              enum:

                - mediatek,mt6795-dpi

                - mediatek,mt8173-dpi

                - mediatek,mt8186-dpi

    then:

      properties:

        power-domains: false



additionalProperties: false



examples:

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

+19 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ properties: 
    description: A phandle and PM domain specifier as defined by bindings of

      the power controller specified by phandle. See

      Documentation/devicetree/bindings/power/power-domain.yaml for details.

    maxItems: 1



  mediatek,gce-client-reg:

    description:
@@ -57,6 +58,9 @@ properties: 
  clocks:

    items:

      - description: SPLIT Clock

      - description: Used for interfacing with the HDMI RX signal source.

      - description: Paired with receiving HDMI RX metadata.

    minItems: 1



required:

  - compatible
@@ -72,9 +76,24 @@ allOf: 
            const: mediatek,mt8195-mdp3-split



    then:

      properties:

        clocks:

          minItems: 3



      required:

        - mediatek,gce-client-reg



  - if:

      properties:

        compatible:

          contains:

            const: mediatek,mt8173-disp-split



    then:

      properties:

        clocks:

          maxItems: 1



additionalProperties: false



examples:

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ properties: 
      atomic mode of operation, even if requested.

    default: 0



  max-rx-timeout-ms:

  arm,max-rx-timeout-ms:

    description:

      An optional time value, expressed in milliseconds, representing the

      transport maximum timeout value for the receive channel. The value should