Merge 4.9-rc7 into usb-next (0edbf9e5) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt→Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host.

	Required properties:		Required properties:

	- compatible : should be "aspeed,ast2400-bt-bmc"		- compatible : should be "aspeed,ast2400-ibt-bmc"
	- reg: physical address and size of the registers		- reg: physical address and size of the registers

	Optional properties:		Optional properties:
	@@ -17,7 +17,7 @@ Optional properties:
	Example:		Example:

	ibt@1e789140 {		ibt@1e789140 {
	compatible = "aspeed,ast2400-bt-bmc";		compatible = "aspeed,ast2400-ibt-bmc";
	reg = <0x1e789140 0x18>;		reg = <0x1e789140 0x18>;
	interrupts = <8>;		interrupts = <8>;
	};		};

Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -12,7 +12,7 @@ Required properties:

	Optional properties:		Optional properties:
	- ti,dmic: phandle for the OMAP dmic node if the machine have it connected		- ti,dmic: phandle for the OMAP dmic node if the machine have it connected
	- ti,jack_detection: Need to be present if the board capable to detect jack		- ti,jack-detection: Need to be present if the board capable to detect jack
	insertion, removal.		insertion, removal.

	Available audio endpoints for the audio-routing table:		Available audio endpoints for the audio-routing table:

Documentation/networking/dsa/dsa.txt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,13 +67,14 @@ Note that DSA does not currently create network interfaces for the "cpu" and
	Switch tagging protocols		Switch tagging protocols
	------------------------		------------------------

	DSA currently supports 4 different tagging protocols, and a tag-less mode as		DSA currently supports 5 different tagging protocols, and a tag-less mode as
	well. The different protocols are implemented in:		well. The different protocols are implemented in:

	net/dsa/tag_trailer.c: Marvell's 4 trailer tag mode (legacy)		net/dsa/tag_trailer.c: Marvell's 4 trailer tag mode (legacy)
	net/dsa/tag_dsa.c: Marvell's original DSA tag		net/dsa/tag_dsa.c: Marvell's original DSA tag
	net/dsa/tag_edsa.c: Marvell's enhanced DSA tag		net/dsa/tag_edsa.c: Marvell's enhanced DSA tag
	net/dsa/tag_brcm.c: Broadcom's 4 bytes tag		net/dsa/tag_brcm.c: Broadcom's 4 bytes tag
			net/dsa/tag_qca.c: Qualcomm's 2 bytes tag

	The exact format of the tag protocol is vendor specific, but in general, they		The exact format of the tag protocol is vendor specific, but in general, they
	all contain something which:		all contain something which:

Documentation/virtual/kvm/api.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -777,6 +777,17 @@ Gets the current timestamp of kvmclock as seen by the current guest. In
	conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios		conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios
	such as migration.		such as migration.

			When KVM_CAP_ADJUST_CLOCK is passed to KVM_CHECK_EXTENSION, it returns the
			set of bits that KVM can return in struct kvm_clock_data's flag member.

			The only flag defined now is KVM_CLOCK_TSC_STABLE. If set, the returned
			value is the exact kvmclock value seen by all VCPUs at the instant
			when KVM_GET_CLOCK was called. If clear, the returned value is simply
			CLOCK_MONOTONIC plus a constant offset; the offset can be modified
			with KVM_SET_CLOCK. KVM will try to make all VCPUs follow this clock,
			but the exact value read by each VCPU could differ, because the host
			TSC is not stable.

	struct kvm_clock_data {		struct kvm_clock_data {
	__u64 clock; /* kvmclock current value */		__u64 clock; /* kvmclock current value */
	__u32 flags;		__u32 flags;

MAINTAINERS

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ Descriptions of section entries:
	Q: Patchwork web based patch tracking system site		Q: Patchwork web based patch tracking system site
	T: SCM tree type and location.		T: SCM tree type and location.
	Type is one of: git, hg, quilt, stgit, topgit		Type is one of: git, hg, quilt, stgit, topgit
			B: Bug tracking system location.
	S: Status, one of the following:		S: Status, one of the following:
	Supported: Someone is actually paid to look after this.		Supported: Someone is actually paid to look after this.
	Maintained: Someone actually looks after it.		Maintained: Someone actually looks after it.
	@@ -281,6 +282,7 @@ L: linux-acpi@vger.kernel.org
	W: https://01.org/linux-acpi		W: https://01.org/linux-acpi
	Q: https://patchwork.kernel.org/project/linux-acpi/list/		Q: https://patchwork.kernel.org/project/linux-acpi/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: drivers/acpi/		F: drivers/acpi/
	F: drivers/pnp/pnpacpi/		F: drivers/pnp/pnpacpi/
	@@ -304,6 +306,8 @@ W: https://acpica.org/
	W: https://github.com/acpica/acpica/		W: https://github.com/acpica/acpica/
	Q: https://patchwork.kernel.org/project/linux-acpi/list/		Q: https://patchwork.kernel.org/project/linux-acpi/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
			B: https://bugzilla.kernel.org
			B: https://bugs.acpica.org
	S: Supported		S: Supported
	F: drivers/acpi/acpica/		F: drivers/acpi/acpica/
	F: include/acpi/		F: include/acpi/
	@@ -313,6 +317,7 @@ ACPI FAN DRIVER
	M: Zhang Rui <rui.zhang@intel.com>		M: Zhang Rui <rui.zhang@intel.com>
	L: linux-acpi@vger.kernel.org		L: linux-acpi@vger.kernel.org
	W: https://01.org/linux-acpi		W: https://01.org/linux-acpi
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: drivers/acpi/fan.c		F: drivers/acpi/fan.c

	@@ -328,6 +333,7 @@ ACPI THERMAL DRIVER
	M: Zhang Rui <rui.zhang@intel.com>		M: Zhang Rui <rui.zhang@intel.com>
	L: linux-acpi@vger.kernel.org		L: linux-acpi@vger.kernel.org
	W: https://01.org/linux-acpi		W: https://01.org/linux-acpi
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: drivers/acpi/thermal		F: drivers/acpi/thermal

	@@ -335,6 +341,7 @@ ACPI VIDEO DRIVER
	M: Zhang Rui <rui.zhang@intel.com>		M: Zhang Rui <rui.zhang@intel.com>
	L: linux-acpi@vger.kernel.org		L: linux-acpi@vger.kernel.org
	W: https://01.org/linux-acpi		W: https://01.org/linux-acpi
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: drivers/acpi/acpi_video.c		F: drivers/acpi/acpi_video.c

	@@ -5663,6 +5670,7 @@ HIBERNATION (aka Software Suspend, aka swsusp)
	M: "Rafael J. Wysocki" <rjw@rjwysocki.net>		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
	M: Pavel Machek <pavel@ucw.cz>		M: Pavel Machek <pavel@ucw.cz>
	L: linux-pm@vger.kernel.org		L: linux-pm@vger.kernel.org
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: arch/x86/power/		F: arch/x86/power/
	F: drivers/base/power/		F: drivers/base/power/
	@@ -7084,6 +7092,7 @@ F: drivers/scsi/53c700*
	LED SUBSYSTEM		LED SUBSYSTEM
	M: Richard Purdie <rpurdie@rpsys.net>		M: Richard Purdie <rpurdie@rpsys.net>
	M: Jacek Anaszewski <j.anaszewski@samsung.com>		M: Jacek Anaszewski <j.anaszewski@samsung.com>
			M: Pavel Machek <pavel@ucw.cz>
	L: linux-leds@vger.kernel.org		L: linux-leds@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
	S: Maintained		S: Maintained
	@@ -8057,6 +8066,7 @@ F: drivers/infiniband/hw/mlx4/
	F: include/linux/mlx4/		F: include/linux/mlx4/

	MELLANOX MLX5 core VPI driver		MELLANOX MLX5 core VPI driver
			M: Saeed Mahameed <saeedm@mellanox.com>
	M: Matan Barak <matanb@mellanox.com>		M: Matan Barak <matanb@mellanox.com>
	M: Leon Romanovsky <leonro@mellanox.com>		M: Leon Romanovsky <leonro@mellanox.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	@@ -9622,6 +9632,7 @@ POWER MANAGEMENT CORE
	M: "Rafael J. Wysocki" <rjw@rjwysocki.net>		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
	L: linux-pm@vger.kernel.org		L: linux-pm@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm		T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: drivers/base/power/		F: drivers/base/power/
	F: include/linux/pm.h		F: include/linux/pm.h
	@@ -11611,6 +11622,7 @@ M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
	M: Len Brown <len.brown@intel.com>		M: Len Brown <len.brown@intel.com>
	M: Pavel Machek <pavel@ucw.cz>		M: Pavel Machek <pavel@ucw.cz>
	L: linux-pm@vger.kernel.org		L: linux-pm@vger.kernel.org
			B: https://bugzilla.kernel.org
	S: Supported		S: Supported
	F: Documentation/power/		F: Documentation/power/
	F: arch/x86/kernel/acpi/		F: arch/x86/kernel/acpi/