Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41ca5d4e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 3669ef9f ("x86, tls: Interpret an all-zero struct user_desc... 


Merge commit 3669ef9f ("x86, tls: Interpret an all-zero struct user_desc as 'no segment'") into x86/asm

Pick up the latestest asm fixes before advancing it any further.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 0fcedc86 3669ef9f

Documentation/ABI/testing/sysfs-class-mei

+15 −0
Original line number Diff line number Diff line
@@ -14,3 +14,18 @@ Description: 
		The /sys/class/mei/meiN directory is created for

		each probed mei device



What:		/sys/class/mei/meiN/fw_status

Date:		Nov 2014

KernelVersion:	3.19

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Display fw status registers content



		The ME FW writes its status information into fw status

		registers for BIOS and OS to monitor fw health.



		The register contains running state, power management

		state, error codes, and others. The way the registers

		are decoded depends on PCH or SoC generation.

		Also number of registers varies between 1 and 6

		depending on generation.

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -3183,7 +3183,7 @@ L: dmaengine@vger.kernel.org 
Q:	https://patchwork.kernel.org/project/linux-dmaengine/list/

S:	Maintained

F:	drivers/dma/

F:	include/linux/dma*

F:	include/linux/dmaengine.h

F:	Documentation/dmaengine/

T:	git git://git.infradead.org/users/vkoul/slave-dma.git
@@ -7747,8 +7747,7 @@ F: Documentation/scsi/LICENSE.qla2xxx 
F:	drivers/scsi/qla2xxx/



QLOGIC QLA4XXX iSCSI DRIVER

M:	Vikas Chaudhary <vikas.chaudhary@qlogic.com>

M:	iscsi-driver@qlogic.com

M:	QLogic-Storage-Upstream@qlogic.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	Documentation/scsi/LICENSE.qla4xxx

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 19

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Diseased Newt



# *DOCUMENTATION*

arch/arm/boot/dts/at91sam9263.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -953,6 +953,8 @@ 
			interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_fb>;

			clocks = <&lcd_clk>, <&lcd_clk>;

			clock-names = "lcdc_clk", "hclk";

			status = "disabled";

		};

arch/arm/boot/dts/berlin2q-marvell-dmp.dts

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ 
};



&sdhci2 {

	broken-cd;

	bus-width = <8>;

	non-removable;

	status = "okay";

};