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

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

Merge 3.18.85 into android-3.18 



Changes in 3.18.85
	s390/disassembler: increase show_code buffer size
	ipv6: only call ip6_route_dev_notify() once for NETDEV_UNREGISTER
	sched: Make resched_cpu() unconditional
	lib/mpi: call cond_resched() from mpi_powm() loop
	x86/decoder: Add new TEST instruction pattern
	ARM: 8721/1: mm: dump: check hardware RO bit for LPAE
	ALSA: hda: Add Raven PCI ID
	dm bufio: fix integer overflow when limiting maximum cache size
	dm: fix race between dm_get_from_kobject() and __dm_destroy()
	MIPS: Fix an n32 core file generation regset support regression
	MIPS: BCM47XX: Fix LED inversion for WRT54GSv1
	autofs: don't fail mount for transient error
	nilfs2: fix race condition that causes file system corruption
	eCryptfs: use after free in ecryptfs_release_messaging()
	bcache: check ca->alloc_thread initialized before wake up it
	isofs: fix timestamps beyond 2027
	NFS: Fix typo in nomigration mount option
	nfs: Fix ugly referral attributes
	nfsd: deal with revoked delegations appropriately
	ext4: fix interaction between i_size, fallocate, and delalloc after a crash
	ALSA: usb-audio: Add sanity checks to FE parser
	ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
	ALSA: usb-audio: Add sanity checks in v2 clock parsers
	ALSA: timer: Remove kernel warning at compat ioctl error paths
	fs/9p: Compare qid.path in v9fs_test_inode
	iscsi-target: Fix non-immediate TMR reference leak
	KVM: nVMX: set IDTR and GDTR limits when loading L1 host state
	KVM: SVM: obey guest PAT
	clk: ti: dra7-atl-clock: Fix of_node reference counting
	clk: ti: dra7-atl-clock: fix child-node lookups
	IB/srpt: Do not accept invalid initiator port names
	NFC: fix device-allocation error return
	time: Always make sure wall_to_monotonic isn't positive
	i40e: Use smp_rmb rather than read_barrier_depends
	igb: Use smp_rmb rather than read_barrier_depends
	igbvf: Use smp_rmb rather than read_barrier_depends
	ixgbevf: Use smp_rmb rather than read_barrier_depends
	i40evf: Use smp_rmb rather than read_barrier_depends
	fm10k: Use smp_rmb rather than read_barrier_depends
	ixgbe: Fix skb list corruption on Power systems
	parisc: Fix validity check of pointer size argument in new CAS implementation
	powerpc/signal: Properly handle return value from uprobe_deny_signal()
	media: Don't do DMA on stack for firmware upload in the AS102 driver
	media: rc: check for integer overflow
	media: v4l2-ctrl: Fix flags field on Control events
	net/9p: Switch to wait_event_killable()
	mtd: nand: Fix writing mtdoops to nand flash.
	USB: fix buffer overflows with parsing CDC headers
	iio: iio-trig-periodic-rtc: Free trigger resource correctly
	e1000e: Fix error path in link detection
	e1000e: Fix return value test
	e1000e: Separate signaling for link check/link up
	RDS: RDMA: return appropriate error on rdma map failures
	PCI: Apply _HPX settings only to relevant devices
	net: 3com: typhoon: typhoon_init_one: make return values more specific
	net: 3com: typhoon: typhoon_init_one: fix incorrect return values
	drm/armada: Fix compile fail
	ALSA: hda - Apply ALC269_FIXUP_NO_SHUTUP on HDA_FIXUP_ACT_PROBE
	mac80211: Remove invalid flag operations in mesh TSF synchronization
	mac80211: Suppress NEW_PEER_CANDIDATE event if no room
	staging: iio: cdc: fix improper return value
	netfilter: nft_queue: use raw_smp_processor_id()
	netfilter: nf_tables: fix oob access
	btrfs: return the actual error value from from btrfs_uuid_tree_iterate
	ASoC: wm_adsp: Don't overrun firmware file buffer when reading region data
	s390/kbuild: enable modversions for symbols exported from asm
	xen: xenbus driver must not accept invalid transaction ids
	Linux 3.18.85

Change-Id: Ic7086a9a3bfb7027e7757861519abb1b5a780a48
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ab932c97 b4251805

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 84

SUBLEVEL = 85

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/mm/dump.c

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static const struct prot_bits section_bits[] = { 
		.val	= PMD_SECT_USER,

		.set	= "USR",

	}, {

		.mask	= L_PMD_SECT_RDONLY,

		.val	= L_PMD_SECT_RDONLY,

		.mask	= L_PMD_SECT_RDONLY | PMD_SECT_AP2,

		.val	= L_PMD_SECT_RDONLY | PMD_SECT_AP2,

		.set	= "ro",

		.clear	= "RW",

#elif __LINUX_ARM_ARCH__ >= 6

arch/mips/bcm47xx/leds.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ bcm47xx_leds_linksys_wrt54g3gv2[] __initconst = { 
/* Verified on: WRT54GS V1.0 */

static const struct gpio_led

bcm47xx_leds_linksys_wrt54g_type_0101[] __initconst = {

	BCM47XX_GPIO_LED(0, "green", "wlan", 0, LEDS_GPIO_DEFSTATE_OFF),

	BCM47XX_GPIO_LED(0, "green", "wlan", 1, LEDS_GPIO_DEFSTATE_OFF),

	BCM47XX_GPIO_LED(1, "green", "power", 0, LEDS_GPIO_DEFSTATE_ON),

	BCM47XX_GPIO_LED(7, "green", "dmz", 1, LEDS_GPIO_DEFSTATE_OFF),

};

arch/mips/kernel/ptrace.c

+17 −0
Original line number Diff line number Diff line
@@ -522,6 +522,19 @@ static const struct user_regset_view user_mips64_view = { 
	.n		= ARRAY_SIZE(mips64_regsets),

};



#ifdef CONFIG_MIPS32_N32



static const struct user_regset_view user_mipsn32_view = {

	.name		= "mipsn32",

	.e_flags	= EF_MIPS_ABI2,

	.e_machine	= ELF_ARCH,

	.ei_osabi	= ELF_OSABI,

	.regsets	= mips64_regsets,

	.n		= ARRAY_SIZE(mips64_regsets),

};



#endif /* CONFIG_MIPS32_N32 */



#endif /* CONFIG_64BIT */



const struct user_regset_view *task_user_regset_view(struct task_struct *task)
@@ -532,6 +545,10 @@ const struct user_regset_view *task_user_regset_view(struct task_struct *task) 
#ifdef CONFIG_MIPS32_O32

	if (test_tsk_thread_flag(task, TIF_32BIT_REGS))

		return &user_mips_view;

#endif

#ifdef CONFIG_MIPS32_N32

	if (test_tsk_thread_flag(task, TIF_32BIT_ADDR))

		return &user_mipsn32_view;

#endif

	return &user_mips64_view;

#endif

arch/parisc/kernel/syscall.S

+3 −3
Original line number Diff line number Diff line
@@ -688,15 +688,15 @@ cas_action: 
	/* ELF32 Process entry path */

lws_compare_and_swap_2:

#ifdef CONFIG_64BIT

	/* Clip the input registers */

	/* Clip the input registers. We don't need to clip %r23 as we

	   only use it for word operations */

	depdi	0, 31, 32, %r26

	depdi	0, 31, 32, %r25

	depdi	0, 31, 32, %r24

	depdi	0, 31, 32, %r23

#endif



	/* Check the validity of the size pointer */

	subi,>>= 4, %r23, %r0

	subi,>>= 3, %r23, %r0

	b,n	lws_exit_nosys



	/* Jump to the functions which will load the old and new values into