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

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

Merge 4.14.105 into android-4.14-p 



Changes in 4.14.105
	Revert "loop: Fix double mutex_unlock(&loop_ctl_mutex) in loop_control_ioctl()"
	Revert "loop: Get rid of loop_index_mutex"
	Revert "loop: Fold __loop_release into loop_release"
	net: stmmac: Fix reception of Broadcom switches tags
	net: stmmac: Disable ACS Feature for GMAC >= 4
	scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached
	drm/msm: Unblock writer if reader closes file
	ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field
	ALSA: compress: prevent potential divide by zero bugs
	ASoC: Variable "val" in function rt274_i2c_probe() could be uninitialized
	clk: vc5: Abort clock configuration without upstream clock
	thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
	usb: dwc3: gadget: synchronize_irq dwc irq in suspend
	usb: dwc3: gadget: Fix the uninitialized link_state when udc starts
	usb: gadget: Potential NULL dereference on allocation error
	genirq: Make sure the initial affinity is not empty
	ASoC: dapm: change snprintf to scnprintf for possible overflow
	ASoC: imx-audmux: change snprintf to scnprintf for possible overflow
	selftests: seccomp: use LDLIBS instead of LDFLAGS
	selftests: gpio-mockup-chardev: Check asprintf() for error
	ARC: fix __ffs return value to avoid build warnings
	drivers: thermal: int340x_thermal: Fix sysfs race condition
	staging: rtl8723bs: Fix build error with Clang when inlining is disabled
	mac80211: fix miscounting of ttl-dropped frames
	sched/wait: Fix rcuwait_wake_up() ordering
	futex: Fix (possible) missed wakeup
	locking/rwsem: Fix (possible) missed wakeup
	drm/amd/powerplay: OD setting fix on Vega10
	serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling
	staging: android: ion: Support cpu access during dma_buf_detach
	direct-io: allow direct writes to empty inodes
	writeback: synchronize sync(2) against cgroup writeback membership switches
	scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state()
	net: altera_tse: fix connect_local_phy error path
	hv_netvsc: Fix ethtool change hash key error
	net: usb: asix: ax88772_bind return error when hw_reset fail
	net: dev_is_mac_header_xmit() true for ARPHRD_RAWIP
	ibmveth: Do not process frames after calling napi_reschedule
	mac80211: don't initiate TDLS connection if station is not associated to AP
	mac80211: Add attribute aligned(2) to struct 'action'
	cfg80211: extend range deviation for DMG
	svm: Fix AVIC incomplete IPI emulation
	KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1
	powerpc: Always initialize input array when calling epapr_hypercall()
	mmc: spi: Fix card detection during probe
	mmc: tmio_mmc_core: don't claim spurious interrupts
	mmc: tmio: fix access width of Block Count Register
	mmc: sdhci-esdhc-imx: correct the fix of ERR004536
	mm: enforce min addr even if capable() in expand_downwards()
	MIPS: fix truncation in __cmpxchg_small for short values
	MIPS: eBPF: Fix icache flush end address
	x86/uaccess: Don't leak the AC flag into __put_user() value evaluation
	Linux 4.14.105

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e0d0c92c 99403097

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 104

SUBLEVEL = 105

EXTRAVERSION =

NAME = Petit Gorille

arch/arc/include/asm/bitops.h

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long word)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long word)

{

	if (!word)

		return word;
@@ -400,9 +400,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x) 
/*

 * __ffs: Similar to ffs, but zero based (0-31)

 */

static inline __attribute__ ((const)) int __ffs(unsigned long x)

static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)

{

	int n;

	unsigned long n;



	asm volatile(

	"	ffs.f	%0, %1		\n"  /* 0:31; 31(Z) if src 0 */

arch/mips/kernel/cmpxchg.c

+1 −2
Original line number Diff line number Diff line
@@ -54,10 +54,9 @@ unsigned long __xchg_small(volatile void *ptr, unsigned long val, unsigned int s 
unsigned long __cmpxchg_small(volatile void *ptr, unsigned long old,

			      unsigned long new, unsigned int size)

{

	u32 mask, old32, new32, load32;

	u32 mask, old32, new32, load32, load;

	volatile u32 *ptr32;

	unsigned int shift;

	u8 load;



	/* Check that ptr is naturally aligned */

	WARN_ON((unsigned long)ptr & (size - 1));

arch/mips/net/ebpf_jit.c

+1 −1
Original line number Diff line number Diff line
@@ -1971,7 +1971,7 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 


	/* Update the icache */

	flush_icache_range((unsigned long)ctx.target,

			   (unsigned long)(ctx.target + ctx.idx * sizeof(u32)));

			   (unsigned long)&ctx.target[ctx.idx]);



	if (bpf_jit_enable > 1)

		/* Dump JIT code */

arch/powerpc/include/asm/epapr_hcalls.h

+6 −6
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in, 


static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];

	unsigned long r;
@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2) 


static inline long epapr_hypercall0(unsigned int nr)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	return epapr_hypercall(in, out, nr);
@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr) 


static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1) 
static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,

				    unsigned long p2)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1, 
static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,

				    unsigned long p2, unsigned long p3)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;
@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1, 
				    unsigned long p2, unsigned long p3,

				    unsigned long p4)

{

	unsigned long in[8];

	unsigned long in[8] = {0};

	unsigned long out[8];



	in[0] = p1;