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

Commit f87ffb2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.9.67 into android-4.9-o 



Changes in 4.9.67
	ARM: dts: LogicPD Torpedo: Fix camera pin mux
	ARM: dts: omap3: logicpd-torpedo-37xx-devkit: Fix MMC1 cd-gpio
	mm, thp: Do not make page table dirty unconditionally in touch_p[mu]d()
	mm/cma: fix alloc_contig_range ret code/potential leak
	mm, hugetlbfs: introduce ->split() to vm_operations_struct
	mm/madvise.c: fix madvise() infinite loop under special circumstances
	btrfs: clear space cache inode generation always
	nfsd: Fix stateid races between OPEN and CLOSE
	nfsd: Fix another OPEN stateid race
	nfsd: fix panic in posix_unblock_lock called from nfs4_laundromat
	mfd: twl4030-power: Fix pmic for boards that need vmmc1 on reboot
	ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate
	KVM: x86: pvclock: Handle first-time write to pvclock-page contains random junk
	KVM: x86: Exit to user-mode on #UD intercept when emulator requires
	KVM: x86: inject exceptions produced by x86_decode_insn
	KVM: lapic: Split out x2apic ldr calculation
	KVM: lapic: Fixup LDR on load in x2apic
	mmc: core: Do not leave the block driver in a suspended state
	mmc: core: prepend 0x to OCR entry in sysfs
	eeprom: at24: fix reading from 24MAC402/24MAC602
	eeprom: at24: correctly set the size for at24mac402
	eeprom: at24: check at24_read/write arguments
	i2c: i801: Fix Failed to allocate irq -2147483648 error
	bcache: Fix building error on MIPS
	hwmon: (jc42) optionally try to disable the SMBUS timeout
	nvme-pci: add quirk for delay before CHK RDY for WDC SN200
	Revert "drm/radeon: dont switch vt on suspend"
	drm/amdgpu: potential uninitialized variable in amdgpu_vce_ring_parse_cs()
	drm/amdgpu: Potential uninitialized variable in amdgpu_vm_update_directories()
	drm/radeon: fix atombios on big endian
	drm/panel: simple: Add missing panel_simple_unprepare() calls
	drm/hisilicon: Ensure LDI regs are properly configured.
	drm/ttm: once more fix ttm_buffer_object_transfer
	drm/amd/pp: fix typecast error in powerplay.
	Revert "x86/entry/64: Add missing irqflags tracing to native_load_gs_index()"
	NFS: revalidate "." etc correctly on "open".
	drm/i915: Don't try indexed reads to alternate slave addresses
	drm/i915: Prevent zero length "index" write
	Linux 4.9.67

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9566f9f5 284bbc78

Documentation/devicetree/bindings/hwmon/jc42.txt

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Required properties: 


- reg: I2C address



Optional properties:

- smbus-timeout-disable: When set, the smbus timeout function will be disabled.

			 This is not supported on all chips.



Example:



temp-sensor@1a {

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 66

SUBLEVEL = 67

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
	interrupts-extended = <&intc 83 &omap3_pmx_core 0x11a>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc1_pins &mmc1_cd>;

	cd-gpios = <&gpio4 31 IRQ_TYPE_LEVEL_LOW>;		/* gpio127 */

	cd-gpios = <&gpio4 31 GPIO_ACTIVE_LOW>;		/* gpio127 */

	vmmc-supply = <&vmmc1>;

	bus-width = <4>;

	cap-power-off-card;
@@ -249,9 +249,9 @@ 
			OMAP3_CORE1_IOPAD(0x2110, PIN_INPUT | MUX_MODE0)   /* cam_xclka.cam_xclka */

			OMAP3_CORE1_IOPAD(0x2112, PIN_INPUT | MUX_MODE0)   /* cam_pclk.cam_pclk */



			OMAP3_CORE1_IOPAD(0x2114, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */

			OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */

			OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */

			OMAP3_CORE1_IOPAD(0x2116, PIN_INPUT | MUX_MODE0)   /* cam_d0.cam_d0 */

			OMAP3_CORE1_IOPAD(0x2118, PIN_INPUT | MUX_MODE0)   /* cam_d1.cam_d1 */

			OMAP3_CORE1_IOPAD(0x211a, PIN_INPUT | MUX_MODE0)   /* cam_d2.cam_d2 */

			OMAP3_CORE1_IOPAD(0x211c, PIN_INPUT | MUX_MODE0)   /* cam_d3.cam_d3 */

			OMAP3_CORE1_IOPAD(0x211e, PIN_INPUT | MUX_MODE0)   /* cam_d4.cam_d4 */

			OMAP3_CORE1_IOPAD(0x2120, PIN_INPUT | MUX_MODE0)   /* cam_d5.cam_d5 */

arch/arm/mach-omap2/pdata-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static struct ti_st_plat_data wilink7_pdata = { 
	.nshutdown_gpio = 162,

	.dev_name = "/dev/ttyO1",

	.flow_cntrl = 1,

	.baud_rate = 300000,

	.baud_rate = 3000000,

};



static struct platform_device wl128x_device = {

arch/x86/entry/entry_64.S

+2 −8
Original line number Diff line number Diff line
@@ -54,19 +54,15 @@ ENTRY(native_usergs_sysret64) 
ENDPROC(native_usergs_sysret64)

#endif /* CONFIG_PARAVIRT */



.macro TRACE_IRQS_FLAGS flags:req

.macro TRACE_IRQS_IRETQ

#ifdef CONFIG_TRACE_IRQFLAGS

	bt	$9, \flags		/* interrupts off? */

	bt	$9, EFLAGS(%rsp)		/* interrupts off? */

	jnc	1f

	TRACE_IRQS_ON

1:

#endif

.endm



.macro TRACE_IRQS_IRETQ

	TRACE_IRQS_FLAGS EFLAGS(%rsp)

.endm



/*

 * When dynamic function tracer is enabled it will add a breakpoint

 * to all locations that it is about to modify, sync CPUs, update
@@ -872,13 +868,11 @@ idtentry simd_coprocessor_error do_simd_coprocessor_error has_error_code=0 
ENTRY(native_load_gs_index)

	pushfq

	DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI)

	TRACE_IRQS_OFF

	SWAPGS

.Lgs_change:

	movl	%edi, %gs

2:	ALTERNATIVE "", "mfence", X86_BUG_SWAPGS_FENCE

	SWAPGS

	TRACE_IRQS_FLAGS (%rsp)

	popfq

	ret

END(native_load_gs_index)