Merge remote-tracking branch 'torvalds/master' into perf/core (bb516937) · Commits · jan.koester / Linux

Documentation/admin-guide/kernel-parameters.txt

+6 −2

Original line number	Diff line number	Diff line
		@@ -2413,8 +2413,12 @@
		Default is 1 (enabled)

		kvm-intel.emulate_invalid_guest_state=
		[KVM,Intel] Enable emulation of invalid guest states
		Default is 0 (disabled)
		[KVM,Intel] Disable emulation of invalid guest state.
		Ignored if kvm-intel.enable_unrestricted_guest=1, as
		guest state is never invalid for unrestricted guests.
		This param doesn't apply to nested guests (L2), as KVM
		never emulates invalid L2 guest state.
		Default is 1 (enabled)

		kvm-intel.flexpriority=
		[KVM,Intel] Disable FlexPriority feature (TPR shadow).

Documentation/devicetree/bindings/i2c/apple,i2c.yaml

+4 −4

Original line number	Diff line number	Diff line
		@@ -20,9 +20,9 @@ allOf:

		properties:
		compatible:
		enum:
		- apple,t8103-i2c
		- apple,i2c
		items:
		- const: apple,t8103-i2c
		- const: apple,i2c

		reg:
		maxItems: 1
		@@ -51,7 +51,7 @@ unevaluatedProperties: false
		examples:
		- \|
		i2c@35010000 {
		compatible = "apple,t8103-i2c";
		compatible = "apple,t8103-i2c", "apple,i2c";
		reg = <0x35010000 0x4000>;
		interrupt-parent = <&aic>;
		interrupts = <0 627 4>;

Documentation/devicetree/bindings/regulator/samsung,s5m8767.yaml

+25 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,19 @@ patternProperties:
		description:
		Properties for single BUCK regulator.

		properties:
		op_mode:
		$ref: /schemas/types.yaml#/definitions/uint32
		enum: [0, 1, 2, 3]
		default: 1
		description: \|
		Describes the different operating modes of the regulator with power
		mode change in SOC. The different possible values are:
		0 - always off mode
		1 - on in normal mode
		2 - low power mode
		3 - suspend mode

		required:
		- regulator-name

		@@ -63,6 +76,18 @@ patternProperties:
		Properties for single BUCK regulator.

		properties:
		op_mode:
		$ref: /schemas/types.yaml#/definitions/uint32
		enum: [0, 1, 2, 3]
		default: 1
		description: \|
		Describes the different operating modes of the regulator with power
		mode change in SOC. The different possible values are:
		0 - always off mode
		1 - on in normal mode
		2 - low power mode
		3 - suspend mode

		s5m8767,pmic-ext-control-gpios:
		maxItems: 1
		description: \|

Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst

+16 −0

Original line number	Diff line number	Diff line
		@@ -440,6 +440,22 @@ NOTE: For 82599-based network connections, if you are enabling jumbo frames in
		a virtual function (VF), jumbo frames must first be enabled in the physical
		function (PF). The VF MTU setting cannot be larger than the PF MTU.

		NBASE-T Support
		---------------
		The ixgbe driver supports NBASE-T on some devices. However, the advertisement
		of NBASE-T speeds is suppressed by default, to accommodate broken network
		switches which cannot cope with advertised NBASE-T speeds. Use the ethtool
		command to enable advertising NBASE-T speeds on devices which support it::

		ethtool -s eth? advertise 0x1800000001028

		On Linux systems with INTERFACES(5), this can be specified as a pre-up command
		in /etc/network/interfaces so that the interface is always brought up with
		NBASE-T support, e.g.::

		iface eth? inet dhcp
		pre-up ethtool -s eth? advertise 0x1800000001028 \|\| true

		Generic Receive Offload, aka GRO
		--------------------------------
		The driver supports the in-kernel software implementation of GRO. GRO has

MAINTAINERS

+7 −7

Original line number	Diff line number	Diff line
		@@ -3066,7 +3066,7 @@ F: Documentation/devicetree/bindings/phy/phy-ath79-usb.txt
		F: drivers/phy/qualcomm/phy-ath79-usb.c

		ATHEROS ATH GENERIC UTILITIES
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: linux-wireless@vger.kernel.org
		S: Supported
		F: drivers/net/wireless/ath/*
		@@ -3081,7 +3081,7 @@ W: https://wireless.wiki.kernel.org/en/users/Drivers/ath5k
		F: drivers/net/wireless/ath/ath5k/

		ATHEROS ATH6KL WIRELESS DRIVER
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: linux-wireless@vger.kernel.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/ath6kl
		@@ -13248,7 +13248,7 @@ F: include/uapi/linux/if_*
		F: include/uapi/linux/netdevice.h

		NETWORKING DRIVERS (WIRELESS)
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: linux-wireless@vger.kernel.org
		S: Maintained
		Q: http://patchwork.kernel.org/project/linux-wireless/list/
		@@ -15704,7 +15704,7 @@ T: git git://linuxtv.org/anttip/media_tree.git
		F: drivers/media/tuners/qt1010*

		QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: ath10k@lists.infradead.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
		@@ -15712,7 +15712,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
		F: drivers/net/wireless/ath/ath10k/

		QUALCOMM ATHEROS ATH11K WIRELESS DRIVER
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: ath11k@lists.infradead.org
		S: Supported
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
		@@ -15885,7 +15885,7 @@ F: Documentation/devicetree/bindings/media/venus
		F: drivers/media/platform/qcom/venus/

		QUALCOMM WCN36XX WIRELESS DRIVER
		M: Kalle Valo <kvalo@codeaurora.org>
		M: Kalle Valo <kvalo@kernel.org>
		L: wcn36xx@lists.infradead.org
		S: Supported
		W: https://wireless.wiki.kernel.org/en/users/Drivers/wcn36xx
		@@ -21059,7 +21059,7 @@ S: Maintained
		F: arch/x86/kernel/cpu/zhaoxin.c

		ZONEFS FILESYSTEM
		M: Damien Le Moal <damien.lemoal@wdc.com>
		M: Damien Le Moal <damien.lemoal@opensource.wdc.com>
		M: Naohiro Aota <naohiro.aota@wdc.com>
		R: Johannes Thumshirn <jth@kernel.org>
		L: linux-fsdevel@vger.kernel.org