Commit d4f14fa5 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-fixes into drm-misc-fixes 



Backmerging to get fixes from v6.18-rc6.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
parents 949f1fd2 6a23ae0a

.mailmap

+5 −2
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com> 
David Brownell <david-b@pacbell.net>

David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>

David Heidelberg <david@ixit.cz> <d.okias@gmail.com>

David Hildenbrand <david@kernel.org> <david@redhat.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>

David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>

David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -426,7 +427,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com> 
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>

Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>

Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>

Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>

Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>

Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -605,7 +606,8 @@ Oleksij Rempel <o.rempel@pengutronix.de> 
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>

Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>

Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oupton@google.com>

Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>

Ondřej Jirman <megi@xff.cz> <megous@megous.com>

Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>

Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
@@ -644,6 +646,7 @@ Qais Yousef <qyousef@layalina.io> <qais.yousef@arm.com> 
Quentin Monnet <qmo@kernel.org> <quentin.monnet@netronome.com>

Quentin Monnet <qmo@kernel.org> <quentin@isovalent.com>

Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>

Rae Moar <raemoar63@gmail.com> <rmoar@google.com>

Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>

Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>

Rajendra Nayak <quic_rjendra@quicinc.com> <rnayak@codeaurora.org>

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -2036,6 +2036,10 @@ S: Botanicka' 68a 
S: 602 00 Brno

S: Czech Republic



N: Karsten Keil

E: isdn@linux-pingi.de

D: ISDN subsystem maintainer



N: Jakob Kemi

E: jakob.kemi@telia.com

D: V4L W9966 Webcam driver

Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml

+1 −1
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/ti,twl4030-gpio.yaml#

$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#

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



title: TI TWL4030 GPIO controller

Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml

+2 −2
Original line number Diff line number Diff line
@@ -180,9 +180,9 @@ allOf: 
    then:

      properties:

        reg:

          minItems: 2

          maxItems: 2

        reg-names:

          minItems: 2

          maxItems: 2

    else:

      properties:

        reg:

Documentation/devicetree/bindings/sound/qcom,pm4125-sdw.yaml

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 4

    items:

      enum: [1, 2, 3, 4]
@@ -48,7 +48,7 @@ properties: 


    $ref: /schemas/types.yaml#/definitions/uint32-array

    minItems: 2

    maxItems: 2

    maxItems: 5

    items:

      enum: [1, 2, 3, 4, 5]