Commit b568d307 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  418e5340 ("ice: move devlink port creation/deletion")
  643ef23b ("ice: Introduce local var for readability")
https://lore.kernel.org/all/20230127124025.0dacef40@canb.auug.org.au/
https://lore.kernel.org/all/20230124005714.3996270-1-anthony.l.nguyen@intel.com/

drivers/net/ethernet/engleder/tsnep_main.c
  3d53aaef ("tsnep: Fix TX queue stop/wake for multiple queues")
  25faa6a4 ("tsnep: Replace TX spin_lock with __netif_tx_lock")
https://lore.kernel.org/all/20230127123604.36bb3e99@canb.auug.org.au/

net/netfilter/nf_conntrack_proto_sctp.c
  13bd9b31 ("Revert "netfilter: conntrack: add sctp DATA_SENT state"")
  a44b7651 ("netfilter: conntrack: unify established states for SCTP paths")
  f71cb8f4 ("netfilter: conntrack: sctp: use nf log infrastructure for invalid packets")
https://lore.kernel.org/all/20230127125052.674281f9@canb.auug.org.au/
https://lore.kernel.org/all/d36076f3-6add-a442-6d4b-ead9f7ffff86@tessares.net/



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

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -2489,6 +2489,13 @@ D: XF86_Mach8 
D: XF86_8514

D: cfdisk (curses based disk partitioning program)



N: Mat Martineau

E: mat@martineau.name

D: MPTCP subsystem co-maintainer 2020-2023

D: Keyctl restricted keyring and Diffie-Hellman UAPI

D: Bluetooth L2CAP ERTM mode and AMP

S: USA



N: John S. Marvin

E: jsm@fc.hp.com

D: PA-RISC port

Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml

+23 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ allOf: 
              - qcom,msm8939-pcnoc

              - qcom,msm8939-snoc

              - qcom,msm8996-a1noc

              - qcom,msm8996-a2noc

              - qcom,msm8996-bimc

              - qcom,msm8996-cnoc

              - qcom,msm8996-pnoc
@@ -186,6 +185,29 @@ allOf: 
      required:

        - power-domains



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,msm8996-a2noc



    then:

      properties:

        clock-names:

          items:

            - const: bus

            - const: bus_a

            - const: aggre2_ufs_axi

            - const: ufs_axi



        clocks:

          items:

            - description: Bus Clock

            - description: Bus A Clock

            - description: Aggregate2 NoC UFS AXI Clock

            - description: UFS AXI Clock



  - if:

      properties:

        compatible:

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"

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



title: Amlogic G12A USB2 PHY
@@ -13,8 +13,8 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,a1-usb2-phy



  reg:

    maxItems: 1
@@ -68,7 +68,7 @@ additionalProperties: false 
examples:

  - |

    phy@36000 {

          compatible = "amlogic,meson-g12a-usb2-phy";

          compatible = "amlogic,g12a-usb2-phy";

          reg = <0x36000 0x2000>;

          clocks = <&xtal>;

          clock-names = "xtal";

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"

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



title: Amlogic G12A USB3 + PCIE Combo PHY
@@ -13,7 +13,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb3-pcie-phy

      - amlogic,g12a-usb3-pcie-phy



  reg:

    maxItems: 1
@@ -49,7 +49,7 @@ additionalProperties: false 
examples:

  - |

    phy@46000 {

          compatible = "amlogic,meson-g12a-usb3-pcie-phy";

          compatible = "amlogic,g12a-usb3-pcie-phy";

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";

Documentation/devicetree/bindings/phy/qcom,usb-hs-28nm.yaml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ properties: 
  compatible:

    enum:

      - qcom,usb-hs-28nm-femtophy

      - qcom,usb-hs-28nm-mdm9607



  reg:

    maxItems: 1