Commit d851f2b2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v6.18-rc5' into objtool/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 24909217 e9a6fb0b

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk> 
Alan Cox <root@hraefn.swansea.linux.org.uk>

Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>

Aleksey Gorelov <aleksey_gorelov@phoenix.com>

Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>

Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>

Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>

Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -227,6 +228,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>
@@ -642,6 +644,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/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>;

	};