Merge branch 'linus/master' into sched/core, to resolve conflict (977b9a00) · Commits · git / linux-net

.mailmap

+2 −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>

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>;
		};

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>;
		};

+3 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,9 @@ allOf:
		required:
		- orientation-switch
		then:
		$ref: /schemas/usb/usb-switch.yaml#
		allOf:
		- $ref: /schemas/usb/usb-switch.yaml#
		- $ref: /schemas/usb/usb-switch-ports.yaml#

		unevaluatedProperties: false

+4 −0