Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (e65ee2fb) · Commits · 戴 / test

COPYING

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,3 +16,5 @@ In addition, other licenses may also apply. Please see:
		Documentation/process/license-rules.rst

		for more details.

		All contributions to the Linux Kernel are subject to this COPYING file.

+5 −1

Original line number	Diff line number	Diff line
		@@ -43,9 +43,13 @@ properties:
		- enum:
		- allwinner,sun8i-h3-tcon-tv
		- allwinner,sun50i-a64-tcon-tv
		- allwinner,sun50i-h6-tcon-tv
		- const: allwinner,sun8i-a83t-tcon-tv

		- items:
		- enum:
		- allwinner,sun50i-h6-tcon-tv
		- const: allwinner,sun8i-r40-tcon-tv

		reg:
		maxItems: 1

+2 −1

Original line number	Diff line number	Diff line
		Ilitek ILI210x/ILI2117/ILI251x touchscreen controller
		Ilitek ILI210x/ILI2117/ILI2120/ILI251x touchscreen controller

		Required properties:
		- compatible:
		ilitek,ili210x for ILI210x
		ilitek,ili2117 for ILI2117
		ilitek,ili2120 for ILI2120
		ilitek,ili251x for ILI251x

		- reg: The I2C address of the device

+4 −0

Original line number	Diff line number	Diff line
		@@ -71,9 +71,13 @@ b) Example for device tree::
		ipmb@10 {
		compatible = "ipmb-dev";
		reg = <0x10>;
		i2c-protocol;
		};
		};

		If xmit of data to be done using raw i2c block vs smbus
		then "i2c-protocol" needs to be defined as above.

		2) Manually from Linux::

		modprobe ipmb-dev-int

+4 −4

Original line number	Diff line number	Diff line
		@@ -244,23 +244,23 @@ disclosure of a particular issue, unless requested by a response team or by
		an involved disclosed party. The current ambassadors list:

		============= ========================================================
		ARM
		ARM Grant Likely <grant.likely@arm.com>
		AMD Tom Lendacky <tom.lendacky@amd.com>
		IBM
		Intel Tony Luck <tony.luck@intel.com>
		Qualcomm Trilok Soni <tsoni@codeaurora.org>

		Microsoft Sasha Levin <sashal@kernel.org>
		Microsoft James Morris <jamorris@linux.microsoft.com>
		VMware
		Xen Andrew Cooper <andrew.cooper3@citrix.com>

		Canonical Tyler Hicks <tyhicks@canonical.com>
		Canonical John Johansen <john.johansen@canonical.com>
		Debian Ben Hutchings <ben@decadent.org.uk>
		Oracle Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
		Red Hat Josh Poimboeuf <jpoimboe@redhat.com>
		SUSE Jiri Kosina <jkosina@suse.cz>

		Amazon Peter Bowen <pzb@amzn.com>
		Amazon
		Google Kees Cook <keescook@chromium.org>
		============= ========================================================