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

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

Merge 3.18.106 into android-3.18 



Changes in 3.18.106
	media: v4l2-compat-ioctl32: don't oops on overlay
	parisc: Fix out of array access in match_pci_device()
	s390/qdio: don't retry EQBS after CCQ 96
	s390/qdio: don't merge ERROR output buffers
	s390/ipl: ensure loadparm valid flag is set
	slip: Check if rstate is initialized before uncompressing
	ubifs: Check ubifs_wbuf_sync() return code
	ubi: Fix error for write access
	ubi: Reject MLC NAND
	fs/reiserfs/journal.c: add missing resierfs_warning() arg
	resource: fix integer overflow at reallocation
	usb: musb: gadget: misplaced out of bounds check
	ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
	xen-netfront: Fix hang on device removal
	ACPI / hotplug / PCI: Check presence of slot itself in get_slot_status()
	USB:fix USB3 devices behind USB3 hubs not resuming at hibernate thaw
	usb: dwc3: pci: Properly cleanup resource
	HID: i2c-hid: fix size check and type usage
	powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write()
	powerpc/64: Fix smp_wmb barrier definition use use lwsync consistently
	powerpc/powernv: define a standard delay for OPAL_BUSY type retry loops
	powerpc/powernv: Fix OPAL NVRAM driver OPAL_BUSY loops
	ASoC: ssm2602: Replace reg_default_raw with reg_default
	thunderbolt: Resume control channel after hibernation image is created
	random: use a tighter cap in credit_entropy_bits_safe()
	jbd2: if the journal is aborted then don't allow update of the log tail
	mmc: jz4740: Fix race condition in IRQ mask update
	clk: mvebu: armada-38x: add support for 1866MHz variants
	clk: mvebu: armada-38x: add support for missing clocks
	thermal: imx: Fix race condition in imx_thermal_probe()
	watchdog: f71808e_wdt: Fix WD_EN register read
	ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
	ALSA: pcm: Use ERESTARTSYS instead of EINTR in OSS emulation
	ALSA: pcm: Avoid potential races between OSS ioctls and read/write
	ALSA: pcm: Return -EBUSY for OSS ioctls changing busy streams
	ALSA: pcm: Fix mutex unbalance in OSS emulation ioctls
	ALSA: pcm: Fix endless loop for XRUN recovery in OSS emulation
	ext4: fail ext4_iget for root directory if unallocated
	ext4: don't allow r/w mounts if metadata blocks overlap the superblock
	drm/radeon: Fix PCIe lane width calculation
	ALSA: rawmidi: Fix missing input substream checks in compat ioctls
	HID: hidraw: Fix crash on HIDIOCGFEATURE with a destroyed device
	MIPS: memset.S: EVA & fault support for small_memset
	MIPS: memset.S: Fix return of __clear_user from Lpartial_fixup
	MIPS: memset.S: Fix clobber of v1 in last_fixup
	powerpc/lib: Fix off-by-one in alternate feature patching
	jffs2_kill_sb(): deal with failed allocations
	hypfs_kill_super(): deal with failed allocations
	rpc_pipefs: fix double-dput()
	Don't leak MNT_INTERNAL away from internal mounts
	autofs: mount point create should honour passed in mode
	fanotify: fix logic of events on child
	Linux 3.18.106

Change-Id: I3b897c032baa154ece3a384b6e76a94a5e7ed708
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b279e85e 915b8f49

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 105

SUBLEVEL = 106

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/at91sam9g25.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
				atmel,mux-mask = <

				      /*    A         B          C     */

				       0xffffffff 0xffe0399f 0xc000001c  /* pioA */

				       0x0007ffff 0x8000fe3f 0x00000000  /* pioB */

				       0x0007ffff 0x00047e3f 0x00000000  /* pioB */

				       0x80000000 0x07c0ffff 0xb83fffff  /* pioC */

				       0x003fffff 0x003f8000 0x00000000  /* pioD */

				      >;

arch/mips/lib/memset.S

+8 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
1:	PTR_ADDIU	a0, 1			/* fill bytewise */

	R10KCBARRIER(0(ra))

	bne		t1, a0, 1b

	sb		a1, -1(a0)

	 EX(sb, a1, -1(a0), .Lsmall_fixup\@)



2:	jr		ra			/* done */

	move		a2, zero
@@ -204,13 +204,18 @@ 
	PTR_L		t0, TI_TASK($28)

	andi		a2, STORMASK

	LONG_L		t0, THREAD_BUADDR(t0)

	LONG_ADDU	a2, t1

	LONG_ADDU	a2, a0

	jr		ra

	LONG_SUBU	a2, t0



.Llast_fixup\@:

	jr		ra

	andi		v1, a2, STORMASK

	 nop



.Lsmall_fixup\@:

	PTR_SUBU	a2, t1, a0

	jr		ra

	 PTR_ADDIU	a2, 1



	.endm

arch/parisc/kernel/drivers.c

+4 −0
Original line number Diff line number Diff line
@@ -648,6 +648,10 @@ static int match_pci_device(struct device *dev, int index, 
					(modpath->mod == PCI_FUNC(devfn)));

	}



	/* index might be out of bounds for bc[] */

	if (index >= 6)

		return 0;



	id = PCI_SLOT(pdev->devfn) | (PCI_FUNC(pdev->devfn) << 5);

	return (modpath->bc[index] == id);

}

arch/powerpc/include/asm/barrier.h

+2 −1
Original line number Diff line number Diff line
@@ -39,7 +39,8 @@ 


#ifdef CONFIG_SMP



#ifdef __SUBARCH_HAS_LWSYNC

/* The sub-arch has lwsync */

#if defined(__powerpc64__) || defined(CONFIG_PPC_E500MC)

#    define SMPWMB      LWSYNC

#else

#    define SMPWMB      eieio