Commit 587eb08a authored by Tejun Heo's avatar Tejun Heo
Browse files

sched_ext: Merge branch 'for-6.19' of... 

sched_ext: Merge branch 'for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

 into for-6.19

Pull cgroup/for-6.19 to receive:

 16dad780 ("cgroup: Rename cgroup lifecycle hooks to cgroup_task_*()")
 260fbcb9 ("cgroup: Move dying_tasks cleanup from cgroup_task_release() to cgroup_task_free()")
 d245698d ("cgroup: Defer task cgroup unlink until after the task is done switching out")

These are needed for the sched_ext cgroup exit ordering fix.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 34423456 d245698d

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com> 
Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

Domen Puncer <domen@coderock.org>

Dong Aisheng <aisheng.dong@nxp.com> <b29396@freescale.com>

Douglas Gilbert <dougg@torque.net>

Drew Fustini <fustini@kernel.org> <drew@pdp7.com>

<duje@dujemihanovic.xyz> <duje.mihanovic@skole.hr>

Documentation/devicetree/bindings/i2c/apm,xgene-slimpro-i2c.yaml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/i2c/apm,xgene-slimpro-i2c.yaml#

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



title: APM X-Gene SLIMpro Mailbox I2C



maintainers:

  - Khuong Dinh <khuong@os.amperecomputing.com>



description:

  An I2C controller accessed over the "SLIMpro" mailbox.



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#



properties:

  compatible:

    const: apm,xgene-slimpro-i2c



  mboxes:

    maxItems: 1



required:

  - compatible

  - mboxes



unevaluatedProperties: false



examples:

  - |

    i2c {

        compatible = "apm,xgene-slimpro-i2c";

        mboxes = <&mailbox 0>;

    };

Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
APM X-Gene SLIMpro Mailbox I2C Driver



An I2C controller accessed over the "SLIMpro" mailbox.



Required properties :



 - compatible : should be "apm,xgene-slimpro-i2c"

 - mboxes : use the label reference for the mailbox as the first parameter.

	    The second parameter is the channel number.



Example :

	i2cslimpro {

		compatible = "apm,xgene-slimpro-i2c";

		mboxes = <&mailbox 0>;

	};

Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ properties: 
              - fsl,imx-audio-nau8822

              - fsl,imx-audio-sgtl5000

              - fsl,imx-audio-si476x

              - fsl,imx-audio-tlv320

              - fsl,imx-audio-tlv320aic31xx

              - fsl,imx-audio-tlv320aic32x4

              - fsl,imx-audio-wm8524

Documentation/devicetree/bindings/sound/qcom,sm8250.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
          - qcom,apq8096-sndcard

          - qcom,glymur-sndcard

          - qcom,qcm6490-idp-sndcard

          - qcom,qcs615-sndcard

          - qcom,qcs6490-rb3gen2-sndcard

          - qcom,qcs8275-sndcard

          - qcom,qcs9075-sndcard