Back merge tag 'v4.4-rc4' into drm-next (e876b41a) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,11 @@ Required properties:
	- phy-mode: See ethernet.txt file in the same directory		- phy-mode: See ethernet.txt file in the same directory
	- clocks: a pointer to the reference clock for this device.		- clocks: a pointer to the reference clock for this device.

			Optional properties:
			- tx-csum-limit: maximum mtu supported by port that allow TX checksum.
			Value is presented in bytes. If not used, by default 1600B is set for
			"marvell,armada-370-neta" and 9800B for others.

	Example:		Example:

	ethernet@d0070000 {		ethernet@d0070000 {
	@@ -15,6 +20,7 @@ ethernet@d0070000 {
	reg = <0xd0070000 0x2500>;		reg = <0xd0070000 0x2500>;
	interrupts = <8>;		interrupts = <8>;
	clocks = <&gate_clk 4>;		clocks = <&gate_clk 4>;
			tx-csum-limit = <9800>
	status = "okay";		status = "okay";
	phy = <&phy0>;		phy = <&phy0>;
	phy-mode = "rgmii-id";		phy-mode = "rgmii-id";

MAINTAINERS

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -318,7 +318,7 @@ 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
	S: Supported		S: Supported
	F: drivers/acpi/video.c		F: drivers/acpi/acpi_video.c

	ACPI WMI DRIVER		ACPI WMI DRIVER
	L: platform-driver-x86@vger.kernel.org		L: platform-driver-x86@vger.kernel.org
	@@ -1847,7 +1847,7 @@ S: Supported
	F: drivers/net/wireless/ath/ath6kl/		F: drivers/net/wireless/ath/ath6kl/

	WILOCITY WIL6210 WIRELESS DRIVER		WILOCITY WIL6210 WIRELESS DRIVER
	M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>		M: Maya Erez <qca_merez@qca.qualcomm.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: wil6210@qca.qualcomm.com		L: wil6210@qca.qualcomm.com
	S: Supported		S: Supported
	@@ -9427,8 +9427,10 @@ F: include/scsi/sg.h

	SCSI SUBSYSTEM		SCSI SUBSYSTEM
	M: "James E.J. Bottomley" <JBottomley@odin.com>		M: "James E.J. Bottomley" <JBottomley@odin.com>
	L: linux-scsi@vger.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
			M: "Martin K. Petersen" <martin.petersen@oracle.com>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
			L: linux-scsi@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/scsi/		F: drivers/scsi/
	F: include/scsi/		F: include/scsi/
	@@ -10903,9 +10905,9 @@ S: Maintained
	F: drivers/media/tuners/tua9001*		F: drivers/media/tuners/tua9001*

	TULIP NETWORK DRIVERS		TULIP NETWORK DRIVERS
	M: Grant Grundler <grundler@parisc-linux.org>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		L: linux-parisc@vger.kernel.org
			S: Orphan
	F: drivers/net/ethernet/dec/tulip/		F: drivers/net/ethernet/dec/tulip/

	TUN/TAP driver		TUN/TAP driver

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 4		PATCHLEVEL = 4
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc3		EXTRAVERSION = -rc4
	NAME = Blurry Fish Butt		NAME = Blurry Fish Butt

	# DOCUMENTATION		# DOCUMENTATION

arch/arm/boot/dts/armada-38x.dtsi

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -498,6 +498,7 @@
	reg = <0x70000 0x4000>;		reg = <0x70000 0x4000>;
	interrupts-extended = <&mpic 8>;		interrupts-extended = <&mpic 8>;
	clocks = <&gateclk 4>;		clocks = <&gateclk 4>;
			tx-csum-limit = <9800>;
	status = "disabled";		status = "disabled";
	};		};

arch/arm/include/asm/kvm_emulate.h

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,18 @@
	unsigned long vcpu_reg(struct kvm_vcpu vcpu, u8 reg_num);		unsigned long vcpu_reg(struct kvm_vcpu vcpu, u8 reg_num);
	unsigned long vcpu_spsr(struct kvm_vcpu vcpu);		unsigned long vcpu_spsr(struct kvm_vcpu vcpu);

			static inline unsigned long vcpu_get_reg(struct kvm_vcpu *vcpu,
			u8 reg_num)
			{
			return *vcpu_reg(vcpu, reg_num);
			}

			static inline void vcpu_set_reg(struct kvm_vcpu *vcpu, u8 reg_num,
			unsigned long val)
			{
			*vcpu_reg(vcpu, reg_num) = val;
			}

	bool kvm_condition_valid(struct kvm_vcpu *vcpu);		bool kvm_condition_valid(struct kvm_vcpu *vcpu);
	void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr);		void kvm_skip_instr(struct kvm_vcpu *vcpu, bool is_wide_instr);
	void kvm_inject_undefined(struct kvm_vcpu *vcpu);		void kvm_inject_undefined(struct kvm_vcpu *vcpu);