Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (55db64dd) · Commits · git / linux-net

.mailmap

+2 −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>
		@@ -803,6 +804,7 @@ Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko.ursulin@onelan.co.uk>
		Tvrtko Ursulin <tursulin@ursulin.net> <tvrtko@ursulin.net>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Tzung-Bi Shih <tzungbi@kernel.org> <tzungbi@google.com>
		Umang Jain <uajain@igalia.com> <umang.jain@ideasonboard.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <u.kleine-koenig@baylibre.com> <ukleinek@baylibre.com>
		Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

+18 −0

Original line number	Diff line number	Diff line
		@@ -608,6 +608,24 @@
		ccw_timeout_log [S390]
		See Documentation/arch/s390/common_io.rst for details.

		cfi= [X86-64] Set Control Flow Integrity checking features
		when CONFIG_FINEIBT is enabled.
		Format: feature[,feature...]
		Default: auto

		auto: Use FineIBT if IBT available, otherwise kCFI.
		Under FineIBT, enable "paranoid" mode when
		FRED is not available.
		off: Turn off CFI checking.
		kcfi: Use kCFI (disable FineIBT).
		fineibt: Use FineIBT (even if IBT not available).
		norand: Do not re-randomize CFI hashes.
		paranoid: Add caller hash checking under FineIBT.
		bhi: Enable register poisoning to stop speculation
		across FineIBT. (Disabled by default.)
		warn: Do not enforce CFI checking: warn only.
		debug: Report CFI initialization details.

		cgroup_disable= [KNL] Disable a particular controller or optional feature
		Format: {name of the controller(s) or feature(s) to disable}
		The effects of cgroup_disable=foo are:

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ properties:

		patternProperties:
		# All other properties should be child nodes with unit-address and 'reg'
		"^[a-zA-Z][a-zA-Z0-9,+\\-._]{0,63}@[0-9a-fA-F]+$":
		"@[0-9a-f]+$":
		type: object
		additionalProperties: true
		properties:

+12 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,18 @@ properties:
		interrupts:
		maxItems: 1

		patternProperties:
		# All other properties should be child nodes with unit-address and 'reg'
		"@[0-9a-f]+$":
		type: object
		additionalProperties: true
		properties:
		reg:
		maxItems: 1

		required:
		- reg

		required:
		- reg

0 → 100644

+51 −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/hisilicon,hix5hd2-i2c.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#
		title: I2C for HiSilicon hix5hd2 chipset platform

		maintainers:
		- Wei Yan <sledge.yanwei@huawei.com>

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

		properties:
		compatible:
		enum:
		- hisilicon,hix5hd2-i2c

		reg:
		maxItems: 1

		interrupts:
		maxItems: 1

		clocks:
		maxItems: 1

		clock-frequency:
		description: Desired I2C bus frequency in Hz
		default: 100000

		required:
		- compatible
		- reg
		- interrupts
		- clocks

		unevaluatedProperties: false

		examples:
		- \|
		#include <dt-bindings/clock/hix5hd2-clock.h>

		i2c@f8b10000 {
		compatible = "hisilicon,hix5hd2-i2c";
		reg = <0xf8b10000 0x1000>;
		interrupts = <0 38 4>;
		clocks = <&clock HIX5HD2_I2C0_RST>;
		#address-cells = <1>;
		#size-cells = <0>;
		};