Commit e19de206 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/ti/icssg/icssg_classifier.c
  abd5576b ("net: ti: icssg-prueth: Add support for ICSSG switch firmware")
  56a5cf53 ("net: ti: icssg-prueth: Fix start counter for ft1 filter")
https://lore.kernel.org/all/20240531123822.3bb7eadf@canb.auug.org.au/



No other adjacent changes.

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

.mailmap

+1 −1
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org> 
Sascha Hauer <s.hauer@pengutronix.de>

Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>

Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>

Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

S.Çağlar Onur <caglar@pardus.org.tr>

Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>

Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

Documentation/devicetree/bindings/input/qcom,pm8xxx-vib.yaml

+12 −4
Original line number Diff line number Diff line
@@ -11,10 +11,18 @@ maintainers: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - qcom,pm8058-vib

          - qcom,pm8916-vib

          - qcom,pm8921-vib

          - qcom,pmi632-vib

      - items:

          - enum:

              - qcom,pm7250b-vib

              - qcom,pm7325b-vib

              - qcom,pm7550ba-vib

          - const: qcom,pmi632-vib



  reg:

    maxItems: 1

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.yaml

+2 −0
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ properties: 
      - edt,edt-ft5406

      - edt,edt-ft5506

      - evervision,ev-ft5726

      - focaltech,ft5452

      - focaltech,ft6236

      - focaltech,ft8719



  reg:

    maxItems: 1

Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml

+9 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 


  managers:

    type: object

    additionalProperties: false

    description:

      List of the PD69208T4/PD69204T4/PD69208M PSE managers. Each manager

      have 4 or 8 physical ports according to the chip version. No need to
@@ -47,8 +48,9 @@ properties: 
      - "#size-cells"



    patternProperties:

      "^manager@0[0-9a-b]$":

      "^manager@[0-9a-b]$":

        type: object

        additionalProperties: false

        description:

          PD69208T4/PD69204T4/PD69208M PSE manager exposing 4 or 8 physical

          ports.
@@ -69,9 +71,14 @@ properties: 
        patternProperties:

          '^port@[0-7]$':

            type: object

            additionalProperties: false



            properties:

              reg:

                maxItems: 1



            required:

              - reg

            additionalProperties: false



        required:

          - reg

Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml

+18 −0
Original line number Diff line number Diff line
@@ -29,13 +29,31 @@ properties: 
      of the ports conversion matrix that establishes relationship between

      the logical ports and the physical channels.

    type: object

    additionalProperties: false



    properties:

      "#address-cells":

        const: 1



      "#size-cells":

        const: 0



    patternProperties:

      '^channel@[0-7]$':

        type: object

        additionalProperties: false



        properties:

          reg:

            maxItems: 1



        required:

          - reg



    required:

      - "#address-cells"

      - "#size-cells"



unevaluatedProperties: false



required: