Commit 38e96109 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'v6.13-rc3' into drm-next



Backmerge linux 6.13-rc3 as amd next has some dependencies on fixes in it.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 301e2772 78d4f34e
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -4822,6 +4822,11 @@
			       can be preempted anytime.  Tasks will also yield
			       contended spinlocks (if the critical section isn't
			       explicitly preempt disabled beyond the lock itself).
			lazy - Scheduler controlled. Similar to full but instead
			       of preempting the task immediately, the task gets
			       one HZ tick time to yield itself before the
			       preemption will be forced. One preemption is when the
			       task returns to user space.

	print-fatal-signals=
			[KNL] debug: print fatal signals
+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#

+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:
+6 −0
Original line number Diff line number Diff line
@@ -2170,6 +2170,12 @@ nexthop_compat_mode - BOOLEAN
	understands the new API, this sysctl can be disabled to achieve full
	performance benefits of the new API by disabling the nexthop expansion
	and extraneous notifications.

	Note that as a backward-compatible mode, dumping of modern features
	might be incomplete or wrong. For example, resilient groups will not be
	shown as such, but rather as just a list of next hops. Also weights that
	do not fit into 8 bits will show incorrectly.

	Default: true (backward compat mode)

fib_notify_on_flag_change - INTEGER
+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
Loading