Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ (4c2a1b86) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/vm/page-types.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -478,7 +478,7 @@ static void prepare_hwpoison_fd(void)
	}		}

	if (opt_unpoison && !hwpoison_forget_fd) {		if (opt_unpoison && !hwpoison_forget_fd) {
	sprintf(buf, "%s/renew-pfn", hwpoison_debug_fs);		sprintf(buf, "%s/unpoison-pfn", hwpoison_debug_fs);
	hwpoison_forget_fd = checked_open(buf, O_WRONLY);		hwpoison_forget_fd = checked_open(buf, O_WRONLY);
	}		}
	}		}

MAINTAINERS

+21 −3

Original line number	Original line	Diff line number	Diff line
	@@ -969,6 +969,16 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: arch/arm/mach-s5p*/		F: arch/arm/mach-s5p*/

			ARM/SAMSUNG S5P SERIES FIMC SUPPORT
			M: Kyungmin Park <kyungmin.park@samsung.com>
			M: Sylwester Nawrocki <s.nawrocki@samsung.com>
			L: linux-arm-kernel@lists.infradead.org
			L: linux-media@vger.kernel.org
			S: Maintained
			F: arch/arm/plat-s5p/dev-fimc*
			F: arch/arm/plat-samsung/include/plat/fimc
			F: drivers/media/video/s5p-fimc/

	ARM/SHMOBILE ARM ARCHITECTURE		ARM/SHMOBILE ARM ARCHITECTURE
	M: Paul Mundt <lethal@linux-sh.org>		M: Paul Mundt <lethal@linux-sh.org>
	M: Magnus Damm <magnus.damm@gmail.com>		M: Magnus Damm <magnus.damm@gmail.com>
	@@ -2535,7 +2545,7 @@ S: Supported
	F: drivers/scsi/gdt*		F: drivers/scsi/gdt*

	GENERIC GPIO I2C DRIVER		GENERIC GPIO I2C DRIVER
	M: Haavard Skinnemoen <hskinnemoen@atmel.com>		M: Haavard Skinnemoen <hskinnemoen@gmail.com>
	S: Supported		S: Supported
	F: drivers/i2c/busses/i2c-gpio.c		F: drivers/i2c/busses/i2c-gpio.c
	F: include/linux/i2c-gpio.h		F: include/linux/i2c-gpio.h
	@@ -3152,7 +3162,7 @@ F: drivers/net/ioc3-eth.c

	IOC3 SERIAL DRIVER		IOC3 SERIAL DRIVER
	M: Pat Gefre <pfg@sgi.com>		M: Pat Gefre <pfg@sgi.com>
	L: linux-mips@linux-mips.org		L: linux-serial@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/serial/ioc3_serial.c		F: drivers/serial/ioc3_serial.c

	@@ -5020,6 +5030,12 @@ F: drivers/media/common/saa7146*
	F: drivers/media/video/7146		F: drivers/media/video/7146
	F: include/media/7146		F: include/media/7146

			SAMSUNG AUDIO (ASoC) DRIVERS
			M: Jassi Brar <jassi.brar@samsung.com>
			L: alsa-devel@alsa-project.org (moderated for non-subscribers)
			S: Supported
			F: sound/soc/s3c24xx

	TLG2300 VIDEO4LINUX-2 DRIVER		TLG2300 VIDEO4LINUX-2 DRIVER
	M: Huang Shijie <shijie8@gmail.com>		M: Huang Shijie <shijie8@gmail.com>
	M: Kang Yong <kangyong@telegent.com>		M: Kang Yong <kangyong@telegent.com>
	@@ -6462,8 +6478,10 @@ F: include/linux/wm97xx.h
	WOLFSON MICROELECTRONICS DRIVERS		WOLFSON MICROELECTRONICS DRIVERS
	M: Mark Brown <broonie@opensource.wolfsonmicro.com>		M: Mark Brown <broonie@opensource.wolfsonmicro.com>
	M: Ian Lartey <ian@opensource.wolfsonmicro.com>		M: Ian Lartey <ian@opensource.wolfsonmicro.com>
			M: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
			T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc
	T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus		T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
	W: http://opensource.wolfsonmicro.com/node/8		W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
	S: Supported		S: Supported
	F: Documentation/hwmon/wm83??		F: Documentation/hwmon/wm83??
	F: drivers/leds/leds-wm83*.c		F: drivers/leds/leds-wm83*.c

Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 36		SUBLEVEL = 36
	EXTRAVERSION = -rc7		EXTRAVERSION =
	NAME = Sheep on Meth		NAME = Flesh-Eating Bats with Fangs

	# DOCUMENTATION		# DOCUMENTATION
	# To see a list of typical targets execute "make help"		# To see a list of typical targets execute "make help"

arch/arm/Kconfig

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1101,6 +1101,20 @@ config ARM_ERRATA_720789
	invalidated are not, resulting in an incoherency in the system page		invalidated are not, resulting in an incoherency in the system page
	tables. The workaround changes the TLB flushing routines to invalidate		tables. The workaround changes the TLB flushing routines to invalidate
	entries regardless of the ASID.		entries regardless of the ASID.

			config ARM_ERRATA_743622
			bool "ARM errata: Faulty hazard checking in the Store Buffer may lead to data corruption"
			depends on CPU_V7
			help
			This option enables the workaround for the 743622 Cortex-A9
			(r2p0..r2p2) erratum. Under very rare conditions, a faulty
			optimisation in the Cortex-A9 Store Buffer may lead to data
			corruption. This workaround sets a specific bit in the diagnostic
			register of the Cortex-A9 which disables the Store Buffer
			optimisation, preventing the defect from occurring. This has no
			visible impact on the overall performance or power consumption of the
			processor.

	endmenu		endmenu

	source "arch/arm/common/Kconfig"		source "arch/arm/common/Kconfig"

arch/arm/kernel/kprobes-decode.c

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1162,11 +1162,12 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
	{		{
	/*		/*
	* MSR : cccc 0011 0x10 xxxx xxxx xxxx xxxx xxxx		* MSR : cccc 0011 0x10 xxxx xxxx xxxx xxxx xxxx
	* Undef : cccc 0011 0x00 xxxx xxxx xxxx xxxx xxxx		* Undef : cccc 0011 0100 xxxx xxxx xxxx xxxx xxxx
	* ALU op with S bit and Rd == 15 :		* ALU op with S bit and Rd == 15 :
	* cccc 001x xxx1 xxxx 1111 xxxx xxxx xxxx		* cccc 001x xxx1 xxxx 1111 xxxx xxxx xxxx
	*/		*/
	if ((insn & 0x0f900000) == 0x03200000 \|\| /* MSR & Undef */		if ((insn & 0x0fb00000) == 0x03200000 \|\| /* MSR */
			(insn & 0x0ff00000) == 0x03400000 \|\| /* Undef */
	(insn & 0x0e10f000) == 0x0210f000) /* ALU s-bit, R15 */		(insn & 0x0e10f000) == 0x0210f000) /* ALU s-bit, R15 */
	return INSN_REJECTED;		return INSN_REJECTED;

	@@ -1177,7 +1178,7 @@ space_cccc_001x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
	* *S (bit 20) updates condition codes		* *S (bit 20) updates condition codes
	* ADC/SBC/RSC reads the C flag		* ADC/SBC/RSC reads the C flag
	*/		*/
	insn &= 0xfff00fff; /* Rn = r0, Rd = r0 */		insn &= 0xffff0fff; /* Rd = r0 */
	asi->insn[0] = insn;		asi->insn[0] = insn;
	asi->insn_handler = (insn & (1 << 20)) ? /* S-bit */		asi->insn_handler = (insn & (1 << 20)) ? /* S-bit */
	emulate_alu_imm_rwflags : emulate_alu_imm_rflags;		emulate_alu_imm_rwflags : emulate_alu_imm_rflags;