Commit 07e5c4eb 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.13-rc4).

No conflicts.

Adjacent changes:

drivers/net/ethernet/renesas/rswitch.h
  32fd46f5 ("net: renesas: rswitch: remove speed from gwca structure")
  922b4b95 ("net: renesas: rswitch: rework ts tags management")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 6b3099eb 8faabc04

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

+2 −5
Original line number Diff line number Diff line
@@ -113,11 +113,8 @@ allOf: 
          maxItems: 1



  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx95-usb-phy

      required:

        - orientation-switch

    then:

      $ref: /schemas/usb/usb-switch.yaml#

Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml

+27 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ properties: 
  compatible:

    enum:

      - qcom,qca6390-pmu

      - qcom,wcn6750-pmu

      - qcom,wcn6855-pmu

      - qcom,wcn7850-pmu
@@ -27,6 +28,9 @@ properties: 
  vddaon-supply:

    description: VDD_AON supply regulator handle



  vddasd-supply:

    description: VDD_ASD supply regulator handle



  vdddig-supply:

    description: VDD_DIG supply regulator handle
@@ -42,6 +46,9 @@ properties: 
  vddio1p2-supply:

    description: VDD_IO_1P2 supply regulator handle



  vddrfa0p8-supply:

    description: VDD_RFA_0P8 supply regulator handle



  vddrfa0p95-supply:

    description: VDD_RFA_0P95 supply regulator handle
@@ -51,12 +58,18 @@ properties: 
  vddrfa1p3-supply:

    description: VDD_RFA_1P3 supply regulator handle



  vddrfa1p7-supply:

    description: VDD_RFA_1P7 supply regulator handle



  vddrfa1p8-supply:

    description: VDD_RFA_1P8 supply regulator handle



  vddrfa1p9-supply:

    description: VDD_RFA_1P9 supply regulator handle



  vddrfa2p2-supply:

    description: VDD_RFA_2P2 supply regulator handle



  vddpcie1p3-supply:

    description: VDD_PCIE_1P3 supply regulator handle
@@ -119,6 +132,20 @@ allOf: 
        - vddpcie1p3-supply

        - vddpcie1p9-supply

        - vddio-supply

  - if:

      properties:

        compatible:

          contains:

            const: qcom,wcn6750-pmu

    then:

      required:

        - vddaon-supply

        - vddasd-supply

        - vddpmu-supply

        - vddrfa0p8-supply

        - vddrfa1p2-supply

        - vddrfa1p7-supply

        - vddrfa2p2-supply

  - if:

      properties:

        compatible:

Documentation/power/runtime_pm.rst

+3 −1
Original line number Diff line number Diff line
@@ -347,7 +347,9 @@ drivers/base/power/runtime.c and include/linux/pm_runtime.h: 


  `int pm_runtime_resume_and_get(struct device *dev);`

    - run pm_runtime_resume(dev) and if successful, increment the device's

      usage counter; return the result of pm_runtime_resume

      usage counter; returns 0 on success (whether or not the device's

      runtime PM status was already 'active') or the error code from

      pm_runtime_resume() on failure.



  `int pm_request_idle(struct device *dev);`

    - submit a request to execute the subsystem-level idle callback for the

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3900,7 +3900,7 @@ W: http://www.baycom.org/~tom/ham/ham.html 
F:	drivers/net/hamradio/baycom*









BCACHE (BLOCK LAYER CACHE)









M:	Coly Li <colyli@suse.de>









M:	Coly Li <colyli@kernel.org>









M:	Kent Overstreet <kent.overstreet@linux.dev>









L:	linux-bcache@vger.kernel.org









S:	Maintained








@@ -8460,7 +8460,7 @@ F:	include/video/s1d13xxxfb.h







EROFS FILE SYSTEM









M:	Gao Xiang <xiang@kernel.org>









M:	Chao Yu <chao@kernel.org>









R:	Yue Hu <huyue2@coolpad.com>









R:	Yue Hu <zbestahu@gmail.com>









R:	Jeffle Xu <jefflexu@linux.alibaba.com>









R:	Sandeep Dhavale <dhavale@google.com>









L:	linux-erofs@lists.ozlabs.org
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 6









PATCHLEVEL = 13









SUBLEVEL = 0









EXTRAVERSION = -rc2









EXTRAVERSION = -rc3









NAME = Baby Opossum Posse



















# *DOCUMENTATION*