diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm/include/asm/cp15.h linux-libre-4.14.123-gnu/arch/arm/include/asm/cp15.h
--- linux-libre-4.14.122-gnu/arch/arm/include/asm/cp15.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm/include/asm/cp15.h	2019-05-31 09:47:36.000000000 -0400
@@ -68,6 +68,8 @@
 #define BPIALL				__ACCESS_CP15(c7, 0, c5, 6)
 #define ICIALLU				__ACCESS_CP15(c7, 0, c5, 0)
 
+#define CNTVCT				__ACCESS_CP15_64(1, c14)
+
 extern unsigned long cr_alignment;	/* defined in entry-armv.S */
 
 static inline unsigned long get_cr(void)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm/vdso/vgettimeofday.c linux-libre-4.14.123-gnu/arch/arm/vdso/vgettimeofday.c
--- linux-libre-4.14.122-gnu/arch/arm/vdso/vgettimeofday.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm/vdso/vgettimeofday.c	2019-05-31 09:47:36.000000000 -0400
@@ -18,9 +18,9 @@
 #include <linux/compiler.h>
 #include <linux/hrtimer.h>
 #include <linux/time.h>
-#include <asm/arch_timer.h>
 #include <asm/barrier.h>
 #include <asm/bug.h>
+#include <asm/cp15.h>
 #include <asm/page.h>
 #include <asm/unistd.h>
 #include <asm/vdso_datapage.h>
@@ -123,7 +123,8 @@ static notrace u64 get_ns(struct vdso_da
 	u64 cycle_now;
 	u64 nsec;
 
-	cycle_now = arch_counter_get_cntvct();
+	isb();
+	cycle_now = read_sysreg(CNTVCT);
 
 	cycle_delta = (cycle_now - vdata->cs_cycle_last) & vdata->cs_mask;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/include/asm/pgtable.h linux-libre-4.14.123-gnu/arch/arm64/include/asm/pgtable.h
--- linux-libre-4.14.122-gnu/arch/arm64/include/asm/pgtable.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/include/asm/pgtable.h	2019-05-31 09:47:36.000000000 -0400
@@ -420,6 +420,8 @@ static inline phys_addr_t pmd_page_paddr
 	return pmd_val(pmd) & PHYS_MASK & (s32)PAGE_MASK;
 }
 
+static inline void pte_unmap(pte_t *pte) { }
+
 /* Find an entry in the third-level page table. */
 #define pte_index(addr)		(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 
@@ -428,7 +430,6 @@ static inline phys_addr_t pmd_page_paddr
 
 #define pte_offset_map(dir,addr)	pte_offset_kernel((dir), (addr))
 #define pte_offset_map_nested(dir,addr)	pte_offset_kernel((dir), (addr))
-#define pte_unmap(pte)			do { } while (0)
 #define pte_unmap_nested(pte)		do { } while (0)
 
 #define pte_set_fixmap(addr)		((pte_t *)set_fixmap_offset(FIX_PTE, addr))
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/include/asm/vdso_datapage.h linux-libre-4.14.123-gnu/arch/arm64/include/asm/vdso_datapage.h
--- linux-libre-4.14.122-gnu/arch/arm64/include/asm/vdso_datapage.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/include/asm/vdso_datapage.h	2019-05-31 09:47:36.000000000 -0400
@@ -38,6 +38,7 @@ struct vdso_data {
 	__u32 tz_minuteswest;	/* Whacky timezone stuff */
 	__u32 tz_dsttime;
 	__u32 use_syscall;
+	__u32 hrtimer_res;
 };
 
 #endif /* !__ASSEMBLY__ */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/kernel/asm-offsets.c linux-libre-4.14.123-gnu/arch/arm64/kernel/asm-offsets.c
--- linux-libre-4.14.122-gnu/arch/arm64/kernel/asm-offsets.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/kernel/asm-offsets.c	2019-05-31 09:47:36.000000000 -0400
@@ -95,7 +95,7 @@ int main(void)
   DEFINE(CLOCK_REALTIME,	CLOCK_REALTIME);
   DEFINE(CLOCK_MONOTONIC,	CLOCK_MONOTONIC);
   DEFINE(CLOCK_MONOTONIC_RAW,	CLOCK_MONOTONIC_RAW);
-  DEFINE(CLOCK_REALTIME_RES,	MONOTONIC_RES_NSEC);
+  DEFINE(CLOCK_REALTIME_RES,	offsetof(struct vdso_data, hrtimer_res));
   DEFINE(CLOCK_REALTIME_COARSE,	CLOCK_REALTIME_COARSE);
   DEFINE(CLOCK_MONOTONIC_COARSE,CLOCK_MONOTONIC_COARSE);
   DEFINE(CLOCK_COARSE_RES,	LOW_RES_NSEC);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/kernel/cpu_ops.c linux-libre-4.14.123-gnu/arch/arm64/kernel/cpu_ops.c
--- linux-libre-4.14.122-gnu/arch/arm64/kernel/cpu_ops.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/kernel/cpu_ops.c	2019-05-31 09:47:36.000000000 -0400
@@ -85,6 +85,7 @@ static const char *__init cpu_read_enabl
 				pr_err("%pOF: missing enable-method property\n",
 					dn);
 		}
+		of_node_put(dn);
 	} else {
 		enable_method = acpi_get_enable_method(cpu);
 		if (!enable_method) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/kernel/vdso/gettimeofday.S linux-libre-4.14.123-gnu/arch/arm64/kernel/vdso/gettimeofday.S
--- linux-libre-4.14.122-gnu/arch/arm64/kernel/vdso/gettimeofday.S	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/kernel/vdso/gettimeofday.S	2019-05-31 09:47:36.000000000 -0400
@@ -301,13 +301,14 @@ ENTRY(__kernel_clock_getres)
 	ccmp	w0, #CLOCK_MONOTONIC_RAW, #0x4, ne
 	b.ne	1f
 
-	ldr	x2, 5f
+	adr	vdso_data, _vdso_data
+	ldr	w2, [vdso_data, #CLOCK_REALTIME_RES]
 	b	2f
 1:
 	cmp	w0, #CLOCK_REALTIME_COARSE
 	ccmp	w0, #CLOCK_MONOTONIC_COARSE, #0x4, ne
 	b.ne	4f
-	ldr	x2, 6f
+	ldr	x2, 5f
 2:
 	cbz	w1, 3f
 	stp	xzr, x2, [x1]
@@ -321,8 +322,6 @@ ENTRY(__kernel_clock_getres)
 	svc	#0
 	ret
 5:
-	.quad	CLOCK_REALTIME_RES
-6:
 	.quad	CLOCK_COARSE_RES
 	.cfi_endproc
 ENDPROC(__kernel_clock_getres)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/kernel/vdso.c linux-libre-4.14.123-gnu/arch/arm64/kernel/vdso.c
--- linux-libre-4.14.122-gnu/arch/arm64/kernel/vdso.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/kernel/vdso.c	2019-05-31 09:47:36.000000000 -0400
@@ -232,6 +232,9 @@ void update_vsyscall(struct timekeeper *
 	vdso_data->wtm_clock_sec		= tk->wall_to_monotonic.tv_sec;
 	vdso_data->wtm_clock_nsec		= tk->wall_to_monotonic.tv_nsec;
 
+	/* Read without the seqlock held by clock_getres() */
+	WRITE_ONCE(vdso_data->hrtimer_res, hrtimer_resolution);
+
 	if (!use_syscall) {
 		/* tkr_mono.cycle_last == tkr_raw.cycle_last */
 		vdso_data->cs_cycle_last	= tk->tkr_mono.cycle_last;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/arm64/mm/dma-mapping.c linux-libre-4.14.123-gnu/arch/arm64/mm/dma-mapping.c
--- linux-libre-4.14.122-gnu/arch/arm64/mm/dma-mapping.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/arm64/mm/dma-mapping.c	2019-05-31 09:47:36.000000000 -0400
@@ -710,6 +710,11 @@ static int __iommu_mmap_attrs(struct dev
 	if (dma_mmap_from_dev_coherent(dev, vma, cpu_addr, size, &ret))
 		return ret;
 
+	if (!is_vmalloc_addr(cpu_addr)) {
+		unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr));
+		return __swiotlb_mmap_pfn(vma, pfn, size);
+	}
+
 	if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
 		/*
 		 * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
@@ -733,6 +738,11 @@ static int __iommu_get_sgtable(struct de
 	unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT;
 	struct vm_struct *area = find_vm_area(cpu_addr);
 
+	if (!is_vmalloc_addr(cpu_addr)) {
+		struct page *page = virt_to_page(cpu_addr);
+		return __swiotlb_get_sgtable_page(sgt, page, size);
+	}
+
 	if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) {
 		/*
 		 * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/powerpc/boot/addnote.c linux-libre-4.14.123-gnu/arch/powerpc/boot/addnote.c
--- linux-libre-4.14.122-gnu/arch/powerpc/boot/addnote.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/powerpc/boot/addnote.c	2019-05-31 09:47:36.000000000 -0400
@@ -223,7 +223,11 @@ main(int ac, char **av)
 	PUT_16(E_PHNUM, np + 2);
 
 	/* write back */
-	lseek(fd, (long) 0, SEEK_SET);
+	i = lseek(fd, (long) 0, SEEK_SET);
+	if (i < 0) {
+		perror("lseek");
+		exit(1);
+	}
 	i = write(fd, buf, n);
 	if (i < 0) {
 		perror("write");
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/powerpc/kernel/head_64.S linux-libre-4.14.123-gnu/arch/powerpc/kernel/head_64.S
--- linux-libre-4.14.122-gnu/arch/powerpc/kernel/head_64.S	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/powerpc/kernel/head_64.S	2019-05-31 09:47:36.000000000 -0400
@@ -961,7 +961,9 @@ start_here_multiplatform:
 
 	/* Restore parameters passed from prom_init/kexec */
 	mr	r3,r31
-	bl	early_setup		/* also sets r13 and SPRG_PACA */
+	LOAD_REG_ADDR(r12, DOTSYM(early_setup))
+	mtctr	r12
+	bctrl		/* also sets r13 and SPRG_PACA */
 
 	LOAD_REG_ADDR(r3, start_here_common)
 	ld	r4,PACAKMSR(r13)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/powerpc/mm/numa.c linux-libre-4.14.123-gnu/arch/powerpc/mm/numa.c
--- linux-libre-4.14.122-gnu/arch/powerpc/mm/numa.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/powerpc/mm/numa.c	2019-05-31 09:47:36.000000000 -0400
@@ -1561,6 +1561,9 @@ int start_topology_update(void)
 {
 	int rc = 0;
 
+	if (!topology_updates_enabled)
+		return 0;
+
 	if (firmware_has_feature(FW_FEATURE_PRRN)) {
 		if (!prrn_enabled) {
 			prrn_enabled = 1;
@@ -1590,6 +1593,9 @@ int stop_topology_update(void)
 {
 	int rc = 0;
 
+	if (!topology_updates_enabled)
+		return 0;
+
 	if (prrn_enabled) {
 		prrn_enabled = 0;
 #ifdef CONFIG_SMP
@@ -1635,11 +1641,13 @@ static ssize_t topology_write(struct fil
 
 	kbuf[read_len] = '\0';
 
-	if (!strncmp(kbuf, "on", 2))
+	if (!strncmp(kbuf, "on", 2)) {
+		topology_updates_enabled = true;
 		start_topology_update();
-	else if (!strncmp(kbuf, "off", 3))
+	} else if (!strncmp(kbuf, "off", 3)) {
 		stop_topology_update();
-	else
+		topology_updates_enabled = false;
+	} else
 		return -EINVAL;
 
 	return count;
@@ -1654,9 +1662,7 @@ static const struct file_operations topo
 
 static int topology_update_init(void)
 {
-	/* Do not poll for changes if disabled at boot */
-	if (topology_updates_enabled)
-		start_topology_update();
+	start_topology_update();
 
 	if (!proc_create("powerpc/topology_updates", 0644, NULL, &topology_ops))
 		return -ENOMEM;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/powerpc/perf/imc-pmu.c linux-libre-4.14.123-gnu/arch/powerpc/perf/imc-pmu.c
--- linux-libre-4.14.122-gnu/arch/powerpc/perf/imc-pmu.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/powerpc/perf/imc-pmu.c	2019-05-31 09:47:36.000000000 -0400
@@ -481,6 +481,11 @@ static int nest_imc_event_init(struct pe
 	 * Get the base memory addresss for this cpu.
 	 */
 	chip_id = cpu_to_chip_id(event->cpu);
+
+	/* Return, if chip_id is not valid */
+	if (chip_id < 0)
+		return -ENODEV;
+
 	pcni = pmu->mem_info;
 	do {
 		if (pcni->id == chip_id) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/ia32/ia32_signal.c linux-libre-4.14.123-gnu/arch/x86/ia32/ia32_signal.c
--- linux-libre-4.14.122-gnu/arch/x86/ia32/ia32_signal.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/ia32/ia32_signal.c	2019-05-31 09:47:36.000000000 -0400
@@ -62,9 +62,8 @@
 } while (0)
 
 #define RELOAD_SEG(seg)		{		\
-	unsigned int pre = GET_SEG(seg);	\
+	unsigned int pre = (seg) | 3;		\
 	unsigned int cur = get_user_seg(seg);	\
-	pre |= 3;				\
 	if (pre != cur)				\
 		set_user_seg(seg, pre);		\
 }
@@ -73,6 +72,7 @@ static int ia32_restore_sigcontext(struc
 				   struct sigcontext_32 __user *sc)
 {
 	unsigned int tmpflags, err = 0;
+	u16 gs, fs, es, ds;
 	void __user *buf;
 	u32 tmp;
 
@@ -80,16 +80,10 @@ static int ia32_restore_sigcontext(struc
 	current->restart_block.fn = do_no_restart_syscall;
 
 	get_user_try {
-		/*
-		 * Reload fs and gs if they have changed in the signal
-		 * handler.  This does not handle long fs/gs base changes in
-		 * the handler, but does not clobber them at least in the
-		 * normal case.
-		 */
-		RELOAD_SEG(gs);
-		RELOAD_SEG(fs);
-		RELOAD_SEG(ds);
-		RELOAD_SEG(es);
+		gs = GET_SEG(gs);
+		fs = GET_SEG(fs);
+		ds = GET_SEG(ds);
+		es = GET_SEG(es);
 
 		COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
 		COPY(dx); COPY(cx); COPY(ip); COPY(ax);
@@ -107,6 +101,17 @@ static int ia32_restore_sigcontext(struc
 		buf = compat_ptr(tmp);
 	} get_user_catch(err);
 
+	/*
+	 * Reload fs and gs if they have changed in the signal
+	 * handler.  This does not handle long fs/gs base changes in
+	 * the handler, but does not clobber them at least in the
+	 * normal case.
+	 */
+	RELOAD_SEG(gs);
+	RELOAD_SEG(fs);
+	RELOAD_SEG(ds);
+	RELOAD_SEG(es);
+
 	err |= fpu__restore_sig(buf, 1);
 
 	force_iret();
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/include/asm/text-patching.h linux-libre-4.14.123-gnu/arch/x86/include/asm/text-patching.h
--- linux-libre-4.14.122-gnu/arch/x86/include/asm/text-patching.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/include/asm/text-patching.h	2019-05-31 09:47:36.000000000 -0400
@@ -38,6 +38,7 @@ extern void *text_poke(void *addr, const
 extern int poke_int3_handler(struct pt_regs *regs);
 extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);
 
+#ifndef CONFIG_UML_X86
 static inline void int3_emulate_jmp(struct pt_regs *regs, unsigned long ip)
 {
 	regs->ip = ip;
@@ -64,6 +65,7 @@ static inline void int3_emulate_call(str
 	int3_emulate_push(regs, regs->ip - INT3_INSN_SIZE + CALL_INSN_SIZE);
 	int3_emulate_jmp(regs, func);
 }
-#endif
+#endif /* CONFIG_X86_64 */
+#endif /* !CONFIG_UML_X86 */
 
 #endif /* _ASM_X86_TEXT_PATCHING_H */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kernel/cpu/mcheck/mce.c linux-libre-4.14.123-gnu/arch/x86/kernel/cpu/mcheck/mce.c
--- linux-libre-4.14.122-gnu/arch/x86/kernel/cpu/mcheck/mce.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kernel/cpu/mcheck/mce.c	2019-05-31 09:47:36.000000000 -0400
@@ -701,19 +701,49 @@ bool machine_check_poll(enum mcp_flags f
 
 		barrier();
 		m.status = mce_rdmsrl(msr_ops.status(i));
+
+		/* If this entry is not valid, ignore it */
 		if (!(m.status & MCI_STATUS_VAL))
 			continue;
 
 		/*
-		 * Uncorrected or signalled events are handled by the exception
-		 * handler when it is enabled, so don't process those here.
-		 *
-		 * TBD do the same check for MCI_STATUS_EN here?
+		 * If we are logging everything (at CPU online) or this
+		 * is a corrected error, then we must log it.
 		 */
-		if (!(flags & MCP_UC) &&
-		    (m.status & (mca_cfg.ser ? MCI_STATUS_S : MCI_STATUS_UC)))
-			continue;
+		if ((flags & MCP_UC) || !(m.status & MCI_STATUS_UC))
+			goto log_it;
+
+		/*
+		 * Newer Intel systems that support software error
+		 * recovery need to make additional checks. Other
+		 * CPUs should skip over uncorrected errors, but log
+		 * everything else.
+		 */
+		if (!mca_cfg.ser) {
+			if (m.status & MCI_STATUS_UC)
+				continue;
+			goto log_it;
+		}
+
+		/* Log "not enabled" (speculative) errors */
+		if (!(m.status & MCI_STATUS_EN))
+			goto log_it;
+
+		/*
+		 * Log UCNA (SDM: 15.6.3 "UCR Error Classification")
+		 * UC == 1 && PCC == 0 && S == 0
+		 */
+		if (!(m.status & MCI_STATUS_PCC) && !(m.status & MCI_STATUS_S))
+			goto log_it;
 
+		/*
+		 * Skip anything else. Presumption is that our read of this
+		 * bank is racing with a machine check. Leave the log alone
+		 * for do_machine_check() to deal with it.
+		 */
+		continue;
+
+log_it:
 		error_seen = true;
 
 		mce_read_aux(&m, i);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kernel/cpu/microcode/core.c linux-libre-4.14.123-gnu/arch/x86/kernel/cpu/microcode/core.c
--- linux-libre-4.14.122-gnu/arch/x86/kernel/cpu/microcode/core.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kernel/cpu/microcode/core.c	2019-05-31 09:47:36.000000000 -0400
@@ -418,8 +418,9 @@ static int do_microcode_update(const voi
 		if (ustate == UCODE_ERROR) {
 			error = -1;
 			break;
-		} else if (ustate == UCODE_OK)
+		} else if (ustate == UCODE_NEW) {
 			apply_microcode_on_target(cpu);
+		}
 	}
 
 	return error;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kernel/irq_64.c linux-libre-4.14.123-gnu/arch/x86/kernel/irq_64.c
--- linux-libre-4.14.122-gnu/arch/x86/kernel/irq_64.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kernel/irq_64.c	2019-05-31 09:47:36.000000000 -0400
@@ -26,9 +26,18 @@ int sysctl_panic_on_stackoverflow;
 /*
  * Probabilistic stack overflow check:
  *
- * Only check the stack in process context, because everything else
- * runs on the big interrupt stacks. Checking reliably is too expensive,
- * so we just check from interrupts.
+ * Regular device interrupts can enter on the following stacks:
+ *
+ * - User stack
+ *
+ * - Kernel task stack
+ *
+ * - Interrupt stack if a device driver reenables interrupts
+ *   which should only happen in really old drivers.
+ *
+ * - Debug IST stack
+ *
+ * All other contexts are invalid.
  */
 static inline void stack_overflow_check(struct pt_regs *regs)
 {
@@ -53,8 +62,8 @@ static inline void stack_overflow_check(
 		return;
 
 	oist = this_cpu_ptr(&orig_ist);
-	estack_top = (u64)oist->ist[0] - EXCEPTION_STKSZ + STACK_TOP_MARGIN;
-	estack_bottom = (u64)oist->ist[N_EXCEPTION_STACKS - 1];
+	estack_bottom = (u64)oist->ist[DEBUG_STACK];
+	estack_top = estack_bottom - DEBUG_STKSZ + STACK_TOP_MARGIN;
 	if (regs->sp >= estack_top && regs->sp <= estack_bottom)
 		return;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kernel/signal.c linux-libre-4.14.123-gnu/arch/x86/kernel/signal.c
--- linux-libre-4.14.122-gnu/arch/x86/kernel/signal.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kernel/signal.c	2019-05-31 09:47:36.000000000 -0400
@@ -131,16 +131,6 @@ static int restore_sigcontext(struct pt_
 		COPY_SEG_CPL3(cs);
 		COPY_SEG_CPL3(ss);
 
-#ifdef CONFIG_X86_64
-		/*
-		 * Fix up SS if needed for the benefit of old DOSEMU and
-		 * CRIU.
-		 */
-		if (unlikely(!(uc_flags & UC_STRICT_RESTORE_SS) &&
-			     user_64bit_mode(regs)))
-			force_valid_ss(regs);
-#endif
-
 		get_user_ex(tmpflags, &sc->flags);
 		regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
 		regs->orig_ax = -1;		/* disable syscall checks */
@@ -149,6 +139,15 @@ static int restore_sigcontext(struct pt_
 		buf = (void __user *)buf_val;
 	} get_user_catch(err);
 
+#ifdef CONFIG_X86_64
+	/*
+	 * Fix up SS if needed for the benefit of old DOSEMU and
+	 * CRIU.
+	 */
+	if (unlikely(!(uc_flags & UC_STRICT_RESTORE_SS) && user_64bit_mode(regs)))
+		force_valid_ss(regs);
+#endif
+
 	err |= fpu__restore_sig(buf, IS_ENABLED(CONFIG_X86_32));
 
 	force_iret();
@@ -460,6 +459,7 @@ static int __setup_rt_frame(int sig, str
 {
 	struct rt_sigframe __user *frame;
 	void __user *fp = NULL;
+	unsigned long uc_flags;
 	int err = 0;
 
 	frame = get_sigframe(&ksig->ka, regs, sizeof(struct rt_sigframe), &fp);
@@ -472,9 +472,11 @@ static int __setup_rt_frame(int sig, str
 			return -EFAULT;
 	}
 
+	uc_flags = frame_uc_flags(regs);
+
 	put_user_try {
 		/* Create the ucontext.  */
-		put_user_ex(frame_uc_flags(regs), &frame->uc.uc_flags);
+		put_user_ex(uc_flags, &frame->uc.uc_flags);
 		put_user_ex(0, &frame->uc.uc_link);
 		save_altstack_ex(&frame->uc.uc_stack, regs->sp);
 
@@ -540,6 +542,7 @@ static int x32_setup_rt_frame(struct ksi
 {
 #ifdef CONFIG_X86_X32_ABI
 	struct rt_sigframe_x32 __user *frame;
+	unsigned long uc_flags;
 	void __user *restorer;
 	int err = 0;
 	void __user *fpstate = NULL;
@@ -554,9 +557,11 @@ static int x32_setup_rt_frame(struct ksi
 			return -EFAULT;
 	}
 
+	uc_flags = frame_uc_flags(regs);
+
 	put_user_try {
 		/* Create the ucontext.  */
-		put_user_ex(frame_uc_flags(regs), &frame->uc.uc_flags);
+		put_user_ex(uc_flags, &frame->uc.uc_flags);
 		put_user_ex(0, &frame->uc.uc_link);
 		compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
 		put_user_ex(0, &frame->uc.uc__pad0);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kernel/vmlinux.lds.S linux-libre-4.14.123-gnu/arch/x86/kernel/vmlinux.lds.S
--- linux-libre-4.14.122-gnu/arch/x86/kernel/vmlinux.lds.S	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kernel/vmlinux.lds.S	2019-05-31 09:47:36.000000000 -0400
@@ -131,11 +131,11 @@ SECTIONS
 		*(.text.__x86.indirect_thunk)
 		__indirect_thunk_end = .;
 #endif
-
-		/* End of text section */
-		_etext = .;
 	} :text = 0x9090
 
+	/* End of text section */
+	_etext = .;
+
 	NOTES :text :note
 
 	EXCEPTION_TABLE(16) :text = 0x9090
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kvm/svm.c linux-libre-4.14.123-gnu/arch/x86/kvm/svm.c
--- linux-libre-4.14.122-gnu/arch/x86/kvm/svm.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kvm/svm.c	2019-05-31 09:47:36.000000000 -0400
@@ -1567,7 +1567,11 @@ static void avic_vcpu_load(struct kvm_vc
 	if (!kvm_vcpu_apicv_active(vcpu))
 		return;
 
-	if (WARN_ON(h_physical_id >= AVIC_MAX_PHYSICAL_ID_COUNT))
+	/*
+	 * Since the host physical APIC id is 8 bits,
+	 * we can support host APIC ID upto 255.
+	 */
+	if (WARN_ON(h_physical_id > AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK))
 		return;
 
 	entry = READ_ONCE(*(svm->avic_physical_id_cache));
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/kvm/x86.c linux-libre-4.14.123-gnu/arch/x86/kvm/x86.c
--- linux-libre-4.14.122-gnu/arch/x86/kvm/x86.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/kvm/x86.c	2019-05-31 09:47:36.000000000 -0400
@@ -1133,7 +1133,7 @@ static int set_efer(struct kvm_vcpu *vcp
 	u64 efer = msr_info->data;
 
 	if (efer & efer_reserved_bits)
-		return false;
+		return 1;
 
 	if (!msr_info->host_initiated) {
 		if (!__kvm_valid_efer(vcpu, efer))
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/Makefile linux-libre-4.14.123-gnu/arch/x86/Makefile
--- linux-libre-4.14.122-gnu/arch/x86/Makefile	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/Makefile	2019-05-31 09:47:36.000000000 -0400
@@ -48,7 +48,7 @@ export REALMODE_CFLAGS
 export BITS
 
 ifdef CONFIG_X86_NEED_RELOCS
-        LDFLAGS_vmlinux := --emit-relocs
+        LDFLAGS_vmlinux := --emit-relocs --discard-none
 endif
 
 #
diff -druNp --no-dereference linux-libre-4.14.122-gnu/arch/x86/mm/fault.c linux-libre-4.14.123-gnu/arch/x86/mm/fault.c
--- linux-libre-4.14.122-gnu/arch/x86/mm/fault.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/arch/x86/mm/fault.c	2019-05-31 09:47:36.000000000 -0400
@@ -426,8 +426,6 @@ static noinline int vmalloc_fault(unsign
 	if (!(address >= VMALLOC_START && address < VMALLOC_END))
 		return -1;
 
-	WARN_ON_ONCE(in_nmi());
-
 	/*
 	 * Copy kernel mappings over when needed. This can also
 	 * happen within a race in page table update. In the later
diff -druNp --no-dereference linux-libre-4.14.122-gnu/block/sed-opal.c linux-libre-4.14.123-gnu/block/sed-opal.c
--- linux-libre-4.14.122-gnu/block/sed-opal.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/block/sed-opal.c	2019-05-31 09:47:36.000000000 -0400
@@ -2078,13 +2078,16 @@ static int opal_erase_locking_range(stru
 static int opal_enable_disable_shadow_mbr(struct opal_dev *dev,
 					  struct opal_mbr_data *opal_mbr)
 {
+	u8 enable_disable = opal_mbr->enable_disable == OPAL_MBR_ENABLE ?
+		OPAL_TRUE : OPAL_FALSE;
+
 	const struct opal_step mbr_steps[] = {
 		{ opal_discovery0, },
 		{ start_admin1LSP_opal_session, &opal_mbr->key },
-		{ set_mbr_done, &opal_mbr->enable_disable },
+		{ set_mbr_done, &enable_disable },
 		{ end_opal_session, },
 		{ start_admin1LSP_opal_session, &opal_mbr->key },
-		{ set_mbr_enable_disable, &opal_mbr->enable_disable },
+		{ set_mbr_enable_disable, &enable_disable },
 		{ end_opal_session, },
 		{ NULL, }
 	};
@@ -2204,7 +2207,7 @@ static int __opal_lock_unlock(struct opa
 
 static int __opal_set_mbr_done(struct opal_dev *dev, struct opal_key *key)
 {
-	u8 mbr_done_tf = 1;
+	u8 mbr_done_tf = OPAL_TRUE;
 	const struct opal_step mbrdone_step [] = {
 		{ opal_discovery0, },
 		{ start_admin1LSP_opal_session, key },
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/acpi/property.c linux-libre-4.14.123-gnu/drivers/acpi/property.c
--- linux-libre-4.14.122-gnu/drivers/acpi/property.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/acpi/property.c	2019-05-31 09:47:36.000000000 -0400
@@ -943,6 +943,14 @@ struct fwnode_handle *acpi_get_next_subn
 		const struct acpi_data_node *data = to_acpi_data_node(fwnode);
 		struct acpi_data_node *dn;
 
+		/*
+		 * We can have a combination of device and data nodes, e.g. with
+		 * hierarchical _DSD properties. Make sure the adev pointer is
+		 * restored before going through data nodes, otherwise we will
+		 * be looking for data_nodes below the last device found instead
+		 * of the common fwnode shared by device_nodes and data_nodes.
+		 */
+		adev = to_acpi_device_node(fwnode);
 		if (adev)
 			head = &adev->data.subnodes;
 		else if (data)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/base/power/main.c linux-libre-4.14.123-gnu/drivers/base/power/main.c
--- linux-libre-4.14.122-gnu/drivers/base/power/main.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/base/power/main.c	2019-05-31 09:47:36.000000000 -0400
@@ -1485,6 +1485,10 @@ static int __device_suspend(struct devic
 	if (dev->power.syscore)
 		goto Complete;
 
+	/* Avoid direct_complete to let wakeup_path propagate. */
+	if (device_may_wakeup(dev) || dev->power.wakeup_path)
+		dev->power.direct_complete = false;
+
 	if (dev->power.direct_complete) {
 		if (pm_runtime_status_suspended(dev)) {
 			pm_runtime_disable(dev);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/char/hw_random/omap-rng.c linux-libre-4.14.123-gnu/drivers/char/hw_random/omap-rng.c
--- linux-libre-4.14.122-gnu/drivers/char/hw_random/omap-rng.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/char/hw_random/omap-rng.c	2019-05-31 09:47:36.000000000 -0400
@@ -442,6 +442,7 @@ static int omap_rng_probe(struct platfor
 	priv->rng.read = omap_rng_do_read;
 	priv->rng.init = omap_rng_init;
 	priv->rng.cleanup = omap_rng_cleanup;
+	priv->rng.quality = 900;
 
 	priv->rng.priv = (unsigned long)priv;
 	platform_set_drvdata(pdev, priv);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/char/random.c linux-libre-4.14.123-gnu/drivers/char/random.c
--- linux-libre-4.14.122-gnu/drivers/char/random.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/char/random.c	2019-05-31 09:47:36.000000000 -0400
@@ -2188,8 +2188,8 @@ struct batched_entropy {
 		u32 entropy_u32[CHACHA20_BLOCK_SIZE / sizeof(u32)];
 	};
 	unsigned int position;
+	spinlock_t batch_lock;
 };
-static rwlock_t batched_entropy_reset_lock = __RW_LOCK_UNLOCKED(batched_entropy_reset_lock);
 
 /*
  * Get a random word for internal kernel use only. The quality of the random
@@ -2199,12 +2199,14 @@ static rwlock_t batched_entropy_reset_lo
  * wait_for_random_bytes() should be called and return 0 at least once
  * at any point prior.
  */
-static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64);
+static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64) = {
+	.batch_lock	= __SPIN_LOCK_UNLOCKED(batched_entropy_u64.lock),
+};
+
 u64 get_random_u64(void)
 {
 	u64 ret;
-	bool use_lock;
-	unsigned long flags = 0;
+	unsigned long flags;
 	struct batched_entropy *batch;
 	static void *previous;
 
@@ -2219,28 +2221,25 @@ u64 get_random_u64(void)
 
 	warn_unseeded_randomness(&previous);
 
-	use_lock = READ_ONCE(crng_init) < 2;
-	batch = &get_cpu_var(batched_entropy_u64);
-	if (use_lock)
-		read_lock_irqsave(&batched_entropy_reset_lock, flags);
+	batch = raw_cpu_ptr(&batched_entropy_u64);
+	spin_lock_irqsave(&batch->batch_lock, flags);
 	if (batch->position % ARRAY_SIZE(batch->entropy_u64) == 0) {
 		extract_crng((u8 *)batch->entropy_u64);
 		batch->position = 0;
 	}
 	ret = batch->entropy_u64[batch->position++];
-	if (use_lock)
-		read_unlock_irqrestore(&batched_entropy_reset_lock, flags);
-	put_cpu_var(batched_entropy_u64);
+	spin_unlock_irqrestore(&batch->batch_lock, flags);
 	return ret;
 }
 EXPORT_SYMBOL(get_random_u64);
 
-static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32);
+static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32) = {
+	.batch_lock	= __SPIN_LOCK_UNLOCKED(batched_entropy_u32.lock),
+};
 u32 get_random_u32(void)
 {
 	u32 ret;
-	bool use_lock;
-	unsigned long flags = 0;
+	unsigned long flags;
 	struct batched_entropy *batch;
 	static void *previous;
 
@@ -2249,18 +2248,14 @@ u32 get_random_u32(void)
 
 	warn_unseeded_randomness(&previous);
 
-	use_lock = READ_ONCE(crng_init) < 2;
-	batch = &get_cpu_var(batched_entropy_u32);
-	if (use_lock)
-		read_lock_irqsave(&batched_entropy_reset_lock, flags);
+	batch = raw_cpu_ptr(&batched_entropy_u32);
+	spin_lock_irqsave(&batch->batch_lock, flags);
 	if (batch->position % ARRAY_SIZE(batch->entropy_u32) == 0) {
 		extract_crng((u8 *)batch->entropy_u32);
 		batch->position = 0;
 	}
 	ret = batch->entropy_u32[batch->position++];
-	if (use_lock)
-		read_unlock_irqrestore(&batched_entropy_reset_lock, flags);
-	put_cpu_var(batched_entropy_u32);
+	spin_unlock_irqrestore(&batch->batch_lock, flags);
 	return ret;
 }
 EXPORT_SYMBOL(get_random_u32);
@@ -2274,12 +2269,19 @@ static void invalidate_batched_entropy(v
 	int cpu;
 	unsigned long flags;
 
-	write_lock_irqsave(&batched_entropy_reset_lock, flags);
 	for_each_possible_cpu (cpu) {
-		per_cpu_ptr(&batched_entropy_u32, cpu)->position = 0;
-		per_cpu_ptr(&batched_entropy_u64, cpu)->position = 0;
+		struct batched_entropy *batched_entropy;
+
+		batched_entropy = per_cpu_ptr(&batched_entropy_u32, cpu);
+		spin_lock_irqsave(&batched_entropy->batch_lock, flags);
+		batched_entropy->position = 0;
+		spin_unlock(&batched_entropy->batch_lock);
+
+		batched_entropy = per_cpu_ptr(&batched_entropy_u64, cpu);
+		spin_lock(&batched_entropy->batch_lock);
+		batched_entropy->position = 0;
+		spin_unlock_irqrestore(&batched_entropy->batch_lock, flags);
 	}
-	write_unlock_irqrestore(&batched_entropy_reset_lock, flags);
 }
 
 /**
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/char/virtio_console.c linux-libre-4.14.123-gnu/drivers/char/virtio_console.c
--- linux-libre-4.14.122-gnu/drivers/char/virtio_console.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/char/virtio_console.c	2019-05-31 09:47:36.000000000 -0400
@@ -75,7 +75,7 @@ struct ports_driver_data {
 	/* All the console devices handled by this driver */
 	struct list_head consoles;
 };
-static struct ports_driver_data pdrvdata;
+static struct ports_driver_data pdrvdata = { .next_vtermno = 1};
 
 static DEFINE_SPINLOCK(pdrvdata_lock);
 static DECLARE_COMPLETION(early_console_added);
@@ -1422,6 +1422,7 @@ static int add_port(struct ports_device
 	port->async_queue = NULL;
 
 	port->cons.ws.ws_row = port->cons.ws.ws_col = 0;
+	port->cons.vtermno = 0;
 
 	port->host_connected = port->guest_connected = false;
 	port->stats = (struct port_stats) { 0 };
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/clk/rockchip/clk-rk3288.c linux-libre-4.14.123-gnu/drivers/clk/rockchip/clk-rk3288.c
--- linux-libre-4.14.122-gnu/drivers/clk/rockchip/clk-rk3288.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/clk/rockchip/clk-rk3288.c	2019-05-31 09:47:36.000000000 -0400
@@ -198,7 +198,7 @@ PNAME(mux_hsadcout_p)	= { "hsadc_src", "
 PNAME(mux_edp_24m_p)	= { "ext_edp_24m", "xin24m" };
 PNAME(mux_tspout_p)	= { "cpll", "gpll", "npll", "xin27m" };
 
-PNAME(mux_aclk_vcodec_pre_p)	= { "aclk_vepu", "aclk_vdpu" };
+PNAME(mux_aclk_vcodec_pre_p)	= { "aclk_vdpu", "aclk_vepu" };
 PNAME(mux_usbphy480m_p)		= { "sclk_otgphy1_480m", "sclk_otgphy2_480m",
 				    "sclk_otgphy0_480m" };
 PNAME(mux_hsicphy480m_p)	= { "cpll", "gpll", "usbphy480m_src" };
@@ -292,13 +292,13 @@ static struct rockchip_clk_branch rk3288
 	COMPOSITE_NOMUX(0, "aclk_core_mp", "armclk", CLK_IGNORE_UNUSED,
 			RK3288_CLKSEL_CON(0), 4, 4, DFLAGS | CLK_DIVIDER_READ_ONLY,
 			RK3288_CLKGATE_CON(12), 6, GFLAGS),
-	COMPOSITE_NOMUX(0, "atclk", "armclk", CLK_IGNORE_UNUSED,
+	COMPOSITE_NOMUX(0, "atclk", "armclk", 0,
 			RK3288_CLKSEL_CON(37), 4, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
 			RK3288_CLKGATE_CON(12), 7, GFLAGS),
 	COMPOSITE_NOMUX(0, "pclk_dbg_pre", "armclk", CLK_IGNORE_UNUSED,
 			RK3288_CLKSEL_CON(37), 9, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
 			RK3288_CLKGATE_CON(12), 8, GFLAGS),
-	GATE(0, "pclk_dbg", "pclk_dbg_pre", CLK_IGNORE_UNUSED,
+	GATE(0, "pclk_dbg", "pclk_dbg_pre", 0,
 			RK3288_CLKGATE_CON(12), 9, GFLAGS),
 	GATE(0, "cs_dbg", "pclk_dbg_pre", CLK_IGNORE_UNUSED,
 			RK3288_CLKGATE_CON(12), 10, GFLAGS),
@@ -399,7 +399,7 @@ static struct rockchip_clk_branch rk3288
 	COMPOSITE(0, "aclk_vdpu", mux_pll_src_cpll_gpll_usb480m_p, 0,
 			RK3288_CLKSEL_CON(32), 14, 2, MFLAGS, 8, 5, DFLAGS,
 			RK3288_CLKGATE_CON(3), 11, GFLAGS),
-	MUXGRF(0, "aclk_vcodec_pre", mux_aclk_vcodec_pre_p, 0,
+	MUXGRF(0, "aclk_vcodec_pre", mux_aclk_vcodec_pre_p, CLK_SET_RATE_PARENT,
 			RK3288_GRF_SOC_CON(0), 7, 1, MFLAGS),
 	GATE(ACLK_VCODEC, "aclk_vcodec", "aclk_vcodec_pre", 0,
 		RK3288_CLKGATE_CON(9), 0, GFLAGS),
@@ -626,7 +626,7 @@ static struct rockchip_clk_branch rk3288
 	INVERTER(SCLK_HSADC, "sclk_hsadc", "sclk_hsadc_out",
 			RK3288_CLKSEL_CON(22), 7, IFLAGS),
 
-	GATE(0, "jtag", "ext_jtag", CLK_IGNORE_UNUSED,
+	GATE(0, "jtag", "ext_jtag", 0,
 			RK3288_CLKGATE_CON(4), 14, GFLAGS),
 
 	COMPOSITE_NODIV(SCLK_USBPHY480M_SRC, "usbphy480m_src", mux_usbphy480m_p, 0,
@@ -635,7 +635,7 @@ static struct rockchip_clk_branch rk3288
 	COMPOSITE_NODIV(SCLK_HSICPHY480M, "sclk_hsicphy480m", mux_hsicphy480m_p, 0,
 			RK3288_CLKSEL_CON(29), 0, 2, MFLAGS,
 			RK3288_CLKGATE_CON(3), 6, GFLAGS),
-	GATE(0, "hsicphy12m_xin12m", "xin12m", CLK_IGNORE_UNUSED,
+	GATE(0, "hsicphy12m_xin12m", "xin12m", 0,
 			RK3288_CLKGATE_CON(13), 9, GFLAGS),
 	DIV(0, "hsicphy12m_usbphy", "sclk_hsicphy480m", 0,
 			RK3288_CLKSEL_CON(11), 8, 6, DFLAGS),
@@ -676,7 +676,7 @@ static struct rockchip_clk_branch rk3288
 	GATE(PCLK_TZPC, "pclk_tzpc", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 3, GFLAGS),
 	GATE(PCLK_UART2, "pclk_uart2", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 9, GFLAGS),
 	GATE(PCLK_EFUSE256, "pclk_efuse_256", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 10, GFLAGS),
-	GATE(PCLK_RKPWM, "pclk_rkpwm", "pclk_cpu", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(11), 11, GFLAGS),
+	GATE(PCLK_RKPWM, "pclk_rkpwm", "pclk_cpu", 0, RK3288_CLKGATE_CON(11), 11, GFLAGS),
 
 	/* ddrctrl [DDR Controller PHY clock] gates */
 	GATE(0, "nclk_ddrupctl0", "ddrphy", CLK_IGNORE_UNUSED, RK3288_CLKGATE_CON(11), 4, GFLAGS),
@@ -816,12 +816,9 @@ static const char *const rk3288_critical
 	"pclk_alive_niu",
 	"pclk_pd_pmu",
 	"pclk_pmu_niu",
-	"pclk_core_niu",
-	"pclk_ddrupctl0",
-	"pclk_publ0",
-	"pclk_ddrupctl1",
-	"pclk_publ1",
 	"pmu_hclk_otg0",
+	/* pwm-regulators on some boards, so handoff-critical later */
+	"pclk_rkpwm",
 };
 
 static void __iomem *rk3288_cru_base;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/cpufreq.c linux-libre-4.14.123-gnu/drivers/cpufreq/cpufreq.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/cpufreq.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/cpufreq.c	2019-05-31 09:47:36.000000000 -0400
@@ -1101,6 +1101,7 @@ static struct cpufreq_policy *cpufreq_po
 				   cpufreq_global_kobject, "policy%u", cpu);
 	if (ret) {
 		pr_err("%s: failed to init policy->kobj: %d\n", __func__, ret);
+		kobject_put(&policy->kobj);
 		goto err_free_real_cpus;
 	}
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/cpufreq_governor.c linux-libre-4.14.123-gnu/drivers/cpufreq/cpufreq_governor.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/cpufreq_governor.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/cpufreq_governor.c	2019-05-31 09:47:36.000000000 -0400
@@ -459,6 +459,8 @@ int cpufreq_dbs_governor_init(struct cpu
 	/* Failure, so roll back. */
 	pr_err("initialization failed (dbs_data kobject init error %d)\n", ret);
 
+	kobject_put(&dbs_data->attr_set.kobj);
+
 	policy->governor_data = NULL;
 
 	if (!have_governor_per_policy())
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/kirkwood-cpufreq.c linux-libre-4.14.123-gnu/drivers/cpufreq/kirkwood-cpufreq.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/kirkwood-cpufreq.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/kirkwood-cpufreq.c	2019-05-31 09:47:36.000000000 -0400
@@ -124,13 +124,14 @@ static int kirkwood_cpufreq_probe(struct
 	priv.cpu_clk = of_clk_get_by_name(np, "cpu_clk");
 	if (IS_ERR(priv.cpu_clk)) {
 		dev_err(priv.dev, "Unable to get cpuclk\n");
-		return PTR_ERR(priv.cpu_clk);
+		err = PTR_ERR(priv.cpu_clk);
+		goto out_node;
 	}
 
 	err = clk_prepare_enable(priv.cpu_clk);
 	if (err) {
 		dev_err(priv.dev, "Unable to prepare cpuclk\n");
-		return err;
+		goto out_node;
 	}
 
 	kirkwood_freq_table[0].frequency = clk_get_rate(priv.cpu_clk) / 1000;
@@ -161,20 +162,22 @@ static int kirkwood_cpufreq_probe(struct
 		goto out_ddr;
 	}
 
-	of_node_put(np);
-	np = NULL;
-
 	err = cpufreq_register_driver(&kirkwood_cpufreq_driver);
-	if (!err)
-		return 0;
+	if (err) {
+		dev_err(priv.dev, "Failed to register cpufreq driver\n");
+		goto out_powersave;
+	}
 
-	dev_err(priv.dev, "Failed to register cpufreq driver\n");
+	of_node_put(np);
+	return 0;
 
+out_powersave:
 	clk_disable_unprepare(priv.powersave_clk);
 out_ddr:
 	clk_disable_unprepare(priv.ddr_clk);
 out_cpu:
 	clk_disable_unprepare(priv.cpu_clk);
+out_node:
 	of_node_put(np);
 
 	return err;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/pasemi-cpufreq.c linux-libre-4.14.123-gnu/drivers/cpufreq/pasemi-cpufreq.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/pasemi-cpufreq.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/pasemi-cpufreq.c	2019-05-31 09:47:36.000000000 -0400
@@ -146,6 +146,7 @@ static int pas_cpufreq_cpu_init(struct c
 
 	cpu = of_get_cpu_node(policy->cpu, NULL);
 
+	of_node_put(cpu);
 	if (!cpu)
 		goto out;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/pmac32-cpufreq.c linux-libre-4.14.123-gnu/drivers/cpufreq/pmac32-cpufreq.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/pmac32-cpufreq.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/pmac32-cpufreq.c	2019-05-31 09:47:36.000000000 -0400
@@ -552,6 +552,7 @@ static int pmac_cpufreq_init_7447A(struc
 	volt_gpio_np = of_find_node_by_name(NULL, "cpu-vcore-select");
 	if (volt_gpio_np)
 		voltage_gpio = read_gpio(volt_gpio_np);
+	of_node_put(volt_gpio_np);
 	if (!voltage_gpio){
 		pr_err("missing cpu-vcore-select gpio\n");
 		return 1;
@@ -588,6 +589,7 @@ static int pmac_cpufreq_init_750FX(struc
 	if (volt_gpio_np)
 		voltage_gpio = read_gpio(volt_gpio_np);
 
+	of_node_put(volt_gpio_np);
 	pvr = mfspr(SPRN_PVR);
 	has_cpu_l2lve = !((pvr & 0xf00) == 0x100);
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/cpufreq/ppc_cbe_cpufreq.c linux-libre-4.14.123-gnu/drivers/cpufreq/ppc_cbe_cpufreq.c
--- linux-libre-4.14.122-gnu/drivers/cpufreq/ppc_cbe_cpufreq.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/cpufreq/ppc_cbe_cpufreq.c	2019-05-31 09:47:36.000000000 -0400
@@ -86,6 +86,7 @@ static int cbe_cpufreq_cpu_init(struct c
 	if (!cbe_get_cpu_pmd_regs(policy->cpu) ||
 	    !cbe_get_cpu_mic_tm_regs(policy->cpu)) {
 		pr_info("invalid CBE regs pointers for cpufreq\n");
+		of_node_put(cpu);
 		return -EINVAL;
 	}
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c linux-libre-4.14.123-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
--- linux-libre-4.14.122-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c	2019-05-31 09:47:36.000000000 -0400
@@ -240,7 +240,10 @@ static int sun4i_hash(struct ahash_reque
 		}
 	} else {
 		/* Since we have the flag final, we can go up to modulo 4 */
-		end = ((areq->nbytes + op->len) / 4) * 4 - op->len;
+		if (areq->nbytes < 4)
+			end = 0;
+		else
+			end = ((areq->nbytes + op->len) / 4) * 4 - op->len;
 	}
 
 	/* TODO if SGlen % 4 and !op->len then DMA */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/crypto/vmx/aesp8-ppc.pl linux-libre-4.14.123-gnu/drivers/crypto/vmx/aesp8-ppc.pl
--- linux-libre-4.14.122-gnu/drivers/crypto/vmx/aesp8-ppc.pl	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/crypto/vmx/aesp8-ppc.pl	2019-05-31 09:47:36.000000000 -0400
@@ -1318,7 +1318,7 @@ Loop_ctr32_enc:
 	addi		$idx,$idx,16
 	bdnz		Loop_ctr32_enc
 
-	vadduwm		$ivec,$ivec,$one
+	vadduqm		$ivec,$ivec,$one
 	 vmr		$dat,$inptail
 	 lvx		$inptail,0,$inp
 	 addi		$inp,$inp,16
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/dma/at_xdmac.c linux-libre-4.14.123-gnu/drivers/dma/at_xdmac.c
--- linux-libre-4.14.122-gnu/drivers/dma/at_xdmac.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/dma/at_xdmac.c	2019-05-31 09:47:36.000000000 -0400
@@ -1606,7 +1606,11 @@ static void at_xdmac_tasklet(unsigned lo
 					struct at_xdmac_desc,
 					xfer_node);
 		dev_vdbg(chan2dev(&atchan->chan), "%s: desc 0x%p\n", __func__, desc);
-		BUG_ON(!desc->active_xfer);
+		if (!desc->active_xfer) {
+			dev_err(chan2dev(&atchan->chan), "Xfer not active: exiting");
+			spin_unlock_bh(&atchan->lock);
+			return;
+		}
 
 		txd = &desc->tx_dma_desc;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/dma/pl330.c linux-libre-4.14.123-gnu/drivers/dma/pl330.c
--- linux-libre-4.14.122-gnu/drivers/dma/pl330.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/dma/pl330.c	2019-05-31 09:47:36.000000000 -0400
@@ -960,6 +960,7 @@ static void _stop(struct pl330_thread *t
 {
 	void __iomem *regs = thrd->dmac->base;
 	u8 insn[6] = {0, 0, 0, 0, 0, 0};
+	u32 inten = readl(regs + INTEN);
 
 	if (_state(thrd) == PL330_STATE_FAULT_COMPLETING)
 		UNTIL(thrd, PL330_STATE_FAULTING | PL330_STATE_KILLING);
@@ -972,10 +973,13 @@ static void _stop(struct pl330_thread *t
 
 	_emit_KILL(0, insn);
 
-	/* Stop generating interrupts for SEV */
-	writel(readl(regs + INTEN) & ~(1 << thrd->ev), regs + INTEN);
-
 	_execute_DBGINSN(thrd, insn, is_manager(thrd));
+
+	/* clear the event */
+	if (inten & (1 << thrd->ev))
+		writel(1 << thrd->ev, regs + INTCLR);
+	/* Stop generating interrupts for SEV */
+	writel(inten & ~(1 << thrd->ev), regs + INTEN);
 }
 
 /* Start doing req 'idx' of thread 'thrd' */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/dma/tegra210-adma.c linux-libre-4.14.123-gnu/drivers/dma/tegra210-adma.c
--- linux-libre-4.14.122-gnu/drivers/dma/tegra210-adma.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/dma/tegra210-adma.c	2019-05-31 09:47:36.000000000 -0400
@@ -22,7 +22,6 @@
 #include <linux/of_device.h>
 #include <linux/of_dma.h>
 #include <linux/of_irq.h>
-#include <linux/pm_clock.h>
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 
@@ -141,6 +140,7 @@ struct tegra_adma {
 	struct dma_device		dma_dev;
 	struct device			*dev;
 	void __iomem			*base_addr;
+	struct clk			*ahub_clk;
 	unsigned int			nr_channels;
 	unsigned long			rx_requests_reserved;
 	unsigned long			tx_requests_reserved;
@@ -637,8 +637,9 @@ static int tegra_adma_runtime_suspend(st
 	struct tegra_adma *tdma = dev_get_drvdata(dev);
 
 	tdma->global_cmd = tdma_read(tdma, ADMA_GLOBAL_CMD);
+	clk_disable_unprepare(tdma->ahub_clk);
 
-	return pm_clk_suspend(dev);
+	return 0;
 }
 
 static int tegra_adma_runtime_resume(struct device *dev)
@@ -646,10 +647,11 @@ static int tegra_adma_runtime_resume(str
 	struct tegra_adma *tdma = dev_get_drvdata(dev);
 	int ret;
 
-	ret = pm_clk_resume(dev);
-	if (ret)
+	ret = clk_prepare_enable(tdma->ahub_clk);
+	if (ret) {
+		dev_err(dev, "ahub clk_enable failed: %d\n", ret);
 		return ret;
-
+	}
 	tdma_write(tdma, ADMA_GLOBAL_CMD, tdma->global_cmd);
 
 	return 0;
@@ -692,13 +694,11 @@ static int tegra_adma_probe(struct platf
 	if (IS_ERR(tdma->base_addr))
 		return PTR_ERR(tdma->base_addr);
 
-	ret = pm_clk_create(&pdev->dev);
-	if (ret)
-		return ret;
-
-	ret = of_pm_clk_add_clk(&pdev->dev, "d_audio");
-	if (ret)
-		goto clk_destroy;
+	tdma->ahub_clk = devm_clk_get(&pdev->dev, "d_audio");
+	if (IS_ERR(tdma->ahub_clk)) {
+		dev_err(&pdev->dev, "Error: Missing ahub controller clock\n");
+		return PTR_ERR(tdma->ahub_clk);
+	}
 
 	pm_runtime_enable(&pdev->dev);
 
@@ -775,8 +775,6 @@ rpm_put:
 	pm_runtime_put_sync(&pdev->dev);
 rpm_disable:
 	pm_runtime_disable(&pdev->dev);
-clk_destroy:
-	pm_clk_destroy(&pdev->dev);
 
 	return ret;
 }
@@ -786,6 +784,7 @@ static int tegra_adma_remove(struct plat
 	struct tegra_adma *tdma = platform_get_drvdata(pdev);
 	int i;
 
+	of_dma_controller_free(pdev->dev.of_node);
 	dma_async_device_unregister(&tdma->dma_dev);
 
 	for (i = 0; i < tdma->nr_channels; ++i)
@@ -793,7 +792,6 @@ static int tegra_adma_remove(struct plat
 
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
-	pm_clk_destroy(&pdev->dev);
 
 	return 0;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/extcon/extcon-arizona.c linux-libre-4.14.123-gnu/drivers/extcon/extcon-arizona.c
--- linux-libre-4.14.122-gnu/drivers/extcon/extcon-arizona.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/extcon/extcon-arizona.c	2019-05-31 09:47:36.000000000 -0400
@@ -1726,6 +1726,16 @@ static int arizona_extcon_remove(struct
 	struct arizona_extcon_info *info = platform_get_drvdata(pdev);
 	struct arizona *arizona = info->arizona;
 	int jack_irq_rise, jack_irq_fall;
+	bool change;
+
+	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+				 ARIZONA_MICD_ENA, 0,
+				 &change);
+
+	if (change) {
+		regulator_disable(info->micvdd);
+		pm_runtime_put(info->dev);
+	}
 
 	gpiod_put(info->micd_pol_gpio);
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c linux-libre-4.14.123-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
--- linux-libre-4.14.122-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c	2019-05-31 09:47:36.000000000 -0400
@@ -135,8 +135,9 @@ int amdgpu_fence_emit(struct amdgpu_ring
 {
 	struct amdgpu_device *adev = ring->adev;
 	struct amdgpu_fence *fence;
-	struct dma_fence *old, **ptr;
+	struct dma_fence __rcu **ptr;
 	uint32_t seq;
+	int r;
 
 	fence = kmem_cache_alloc(amdgpu_fence_slab, GFP_KERNEL);
 	if (fence == NULL)
@@ -152,15 +153,24 @@ int amdgpu_fence_emit(struct amdgpu_ring
 			       seq, AMDGPU_FENCE_FLAG_INT);
 
 	ptr = &ring->fence_drv.fences[seq & ring->fence_drv.num_fences_mask];
+	if (unlikely(rcu_dereference_protected(*ptr, 1))) {
+		struct dma_fence *old;
+
+		rcu_read_lock();
+		old = dma_fence_get_rcu_safe(ptr);
+		rcu_read_unlock();
+
+		if (old) {
+			r = dma_fence_wait(old, false);
+			dma_fence_put(old);
+			if (r)
+				return r;
+		}
+	}
+
 	/* This function can't be called concurrently anyway, otherwise
 	 * emitting the fence would mess up the hardware ring buffer.
 	 */
-	old = rcu_dereference_protected(*ptr, 1);
-	if (old && !dma_fence_is_signaled(old)) {
-		DRM_INFO("rcu slot is busy\n");
-		dma_fence_wait(old, false);
-	}
-
 	rcu_assign_pointer(*ptr, dma_fence_get(&fence->base));
 
 	*f = &fence->base;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/gpu/drm/drm_drv.c linux-libre-4.14.123-gnu/drivers/gpu/drm/drm_drv.c
--- linux-libre-4.14.122-gnu/drivers/gpu/drm/drm_drv.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/gpu/drm/drm_drv.c	2019-05-31 09:47:36.000000000 -0400
@@ -505,7 +505,7 @@ int drm_dev_init(struct drm_device *dev,
 	}
 
 	kref_init(&dev->ref);
-	dev->dev = parent;
+	dev->dev = get_device(parent);
 	dev->driver = driver;
 
 	INIT_LIST_HEAD(&dev->filelist);
@@ -572,6 +572,7 @@ err_minors:
 	drm_minor_free(dev, DRM_MINOR_CONTROL);
 	drm_fs_inode_free(dev->anon_inode);
 err_free:
+	put_device(dev->dev);
 	mutex_destroy(&dev->master_mutex);
 	mutex_destroy(&dev->ctxlist_mutex);
 	mutex_destroy(&dev->filelist_mutex);
@@ -607,6 +608,8 @@ void drm_dev_fini(struct drm_device *dev
 	drm_minor_free(dev, DRM_MINOR_RENDER);
 	drm_minor_free(dev, DRM_MINOR_CONTROL);
 
+	put_device(dev->dev);
+
 	mutex_destroy(&dev->master_mutex);
 	mutex_destroy(&dev->ctxlist_mutex);
 	mutex_destroy(&dev->filelist_mutex);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/gpu/drm/drm_file.c linux-libre-4.14.123-gnu/drivers/gpu/drm/drm_file.c
--- linux-libre-4.14.122-gnu/drivers/gpu/drm/drm_file.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/gpu/drm/drm_file.c	2019-05-31 09:47:36.000000000 -0400
@@ -525,6 +525,7 @@ put_back_event:
 				file_priv->event_space -= length;
 				list_add(&e->link, &file_priv->event_list);
 				spin_unlock_irq(&dev->event_lock);
+				wake_up_interruptible(&file_priv->event_wait);
 				break;
 			}
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/gpu/drm/msm/adreno/a5xx_gpu.c linux-libre-4.14.123-gnu/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
--- linux-libre-4.14.122-gnu/drivers/gpu/drm/msm/adreno/a5xx_gpu.c	2019-05-26 00:38:50.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/gpu/drm/msm/adreno/a5xx_gpu.c	2019-05-31 18:18:08.000000000 -0400
@@ -29,7 +29,7 @@ static void a5xx_dump(struct msm_gpu *gp
 static int zap_shader_load_mdt(struct device *dev, const char *fwname)
 {
 	const struct firmware *fw;
-	struct device_node *np;
+	struct device_node *np, *mem_np;
 	struct resource r;
 	phys_addr_t mem_phys;
 	ssize_t mem_size;
@@ -43,11 +43,13 @@ static int zap_shader_load_mdt(struct de
 	if (!np)
 		return -ENODEV;
 
-	np = of_parse_phandle(np, "memory-region", 0);
-	if (!np)
+	mem_np = of_parse_phandle(np, "memory-region", 0);
+	of_node_put(np);
+	if (!mem_np)
 		return -EINVAL;
 
-	ret = of_address_to_resource(np, 0, &r);
+	ret = of_address_to_resource(mem_np, 0, &r);
+	of_node_put(mem_np);
 	if (ret)
 		return ret;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hid/hid-core.c linux-libre-4.14.123-gnu/drivers/hid/hid-core.c
--- linux-libre-4.14.122-gnu/drivers/hid/hid-core.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hid/hid-core.c	2019-05-31 09:47:36.000000000 -0400
@@ -199,13 +199,14 @@ static unsigned hid_lookup_collection(st
  * Add a usage to the temporary parser table.
  */
 
-static int hid_add_usage(struct hid_parser *parser, unsigned usage)
+static int hid_add_usage(struct hid_parser *parser, unsigned usage, u8 size)
 {
 	if (parser->local.usage_index >= HID_MAX_USAGES) {
 		hid_err(parser->device, "usage index exceeded\n");
 		return -1;
 	}
 	parser->local.usage[parser->local.usage_index] = usage;
+	parser->local.usage_size[parser->local.usage_index] = size;
 	parser->local.collection_index[parser->local.usage_index] =
 		parser->collection_stack_ptr ?
 		parser->collection_stack[parser->collection_stack_ptr - 1] : 0;
@@ -462,10 +463,7 @@ static int hid_parser_local(struct hid_p
 			return 0;
 		}
 
-		if (item->size <= 2)
-			data = (parser->global.usage_page << 16) + data;
-
-		return hid_add_usage(parser, data);
+		return hid_add_usage(parser, data, item->size);
 
 	case HID_LOCAL_ITEM_TAG_USAGE_MINIMUM:
 
@@ -474,9 +472,6 @@ static int hid_parser_local(struct hid_p
 			return 0;
 		}
 
-		if (item->size <= 2)
-			data = (parser->global.usage_page << 16) + data;
-
 		parser->local.usage_minimum = data;
 		return 0;
 
@@ -487,9 +482,6 @@ static int hid_parser_local(struct hid_p
 			return 0;
 		}
 
-		if (item->size <= 2)
-			data = (parser->global.usage_page << 16) + data;
-
 		count = data - parser->local.usage_minimum;
 		if (count + parser->local.usage_index >= HID_MAX_USAGES) {
 			/*
@@ -509,7 +501,7 @@ static int hid_parser_local(struct hid_p
 		}
 
 		for (n = parser->local.usage_minimum; n <= data; n++)
-			if (hid_add_usage(parser, n)) {
+			if (hid_add_usage(parser, n, item->size)) {
 				dbg_hid("hid_add_usage failed\n");
 				return -1;
 			}
@@ -524,6 +516,22 @@ static int hid_parser_local(struct hid_p
 }
 
 /*
+ * Concatenate Usage Pages into Usages where relevant:
+ * As per specification, 6.2.2.8: "When the parser encounters a main item it
+ * concatenates the last declared Usage Page with a Usage to form a complete
+ * usage value."
+ */
+
+static void hid_concatenate_usage_page(struct hid_parser *parser)
+{
+	int i;
+
+	for (i = 0; i < parser->local.usage_index; i++)
+		if (parser->local.usage_size[i] <= 2)
+			parser->local.usage[i] += parser->global.usage_page << 16;
+}
+
+/*
  * Process a main item.
  */
 
@@ -532,6 +540,8 @@ static int hid_parser_main(struct hid_pa
 	__u32 data;
 	int ret;
 
+	hid_concatenate_usage_page(parser);
+
 	data = item_udata(item);
 
 	switch (item->tag) {
@@ -741,6 +751,8 @@ static int hid_scan_main(struct hid_pars
 	__u32 data;
 	int i;
 
+	hid_concatenate_usage_page(parser);
+
 	data = item_udata(item);
 
 	switch (item->tag) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hid/hid-logitech-hidpp.c linux-libre-4.14.123-gnu/drivers/hid/hid-logitech-hidpp.c
--- linux-libre-4.14.122-gnu/drivers/hid/hid-logitech-hidpp.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hid/hid-logitech-hidpp.c	2019-05-31 09:47:36.000000000 -0400
@@ -725,13 +725,16 @@ static int hidpp_root_get_feature(struct
 
 static int hidpp_root_get_protocol_version(struct hidpp_device *hidpp)
 {
+	const u8 ping_byte = 0x5a;
+	u8 ping_data[3] = { 0, 0, ping_byte };
 	struct hidpp_report response;
 	int ret;
 
-	ret = hidpp_send_fap_command_sync(hidpp,
+	ret = hidpp_send_rap_command_sync(hidpp,
+			REPORT_ID_HIDPP_SHORT,
 			HIDPP_PAGE_ROOT_IDX,
 			CMD_ROOT_GET_PROTOCOL_VERSION,
-			NULL, 0, &response);
+			ping_data, sizeof(ping_data), &response);
 
 	if (ret == HIDPP_ERROR_INVALID_SUBID) {
 		hidpp->protocol_major = 1;
@@ -751,8 +754,14 @@ static int hidpp_root_get_protocol_versi
 	if (ret)
 		return ret;
 
-	hidpp->protocol_major = response.fap.params[0];
-	hidpp->protocol_minor = response.fap.params[1];
+	if (response.rap.params[2] != ping_byte) {
+		hid_err(hidpp->hid_dev, "%s: ping mismatch 0x%02x != 0x%02x\n",
+			__func__, response.rap.params[2], ping_byte);
+		return -EPROTO;
+	}
+
+	hidpp->protocol_major = response.rap.params[0];
+	hidpp->protocol_minor = response.rap.params[1];
 
 	return ret;
 }
@@ -901,7 +910,11 @@ static int hidpp_map_battery_level(int c
 {
 	if (capacity < 11)
 		return POWER_SUPPLY_CAPACITY_LEVEL_CRITICAL;
-	else if (capacity < 31)
+	/*
+	 * The spec says this should be < 31 but some devices report 30
+	 * with brand new batteries and Windows reports 30 as "Good".
+	 */
+	else if (capacity < 30)
 		return POWER_SUPPLY_CAPACITY_LEVEL_LOW;
 	else if (capacity < 81)
 		return POWER_SUPPLY_CAPACITY_LEVEL_NORMAL;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hwmon/f71805f.c linux-libre-4.14.123-gnu/drivers/hwmon/f71805f.c
--- linux-libre-4.14.122-gnu/drivers/hwmon/f71805f.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hwmon/f71805f.c	2019-05-31 09:47:36.000000000 -0400
@@ -96,17 +96,23 @@ superio_select(int base, int ld)
 	outb(ld, base + 1);
 }
 
-static inline void
+static inline int
 superio_enter(int base)
 {
+	if (!request_muxed_region(base, 2, DRVNAME))
+		return -EBUSY;
+
 	outb(0x87, base);
 	outb(0x87, base);
+
+	return 0;
 }
 
 static inline void
 superio_exit(int base)
 {
 	outb(0xaa, base);
+	release_region(base, 2);
 }
 
 /*
@@ -1561,7 +1567,7 @@ exit:
 static int __init f71805f_find(int sioaddr, unsigned short *address,
 			       struct f71805f_sio_data *sio_data)
 {
-	int err = -ENODEV;
+	int err;
 	u16 devid;
 
 	static const char * const names[] = {
@@ -1569,8 +1575,11 @@ static int __init f71805f_find(int sioad
 		"F71872F/FG or F71806F/FG",
 	};
 
-	superio_enter(sioaddr);
+	err = superio_enter(sioaddr);
+	if (err)
+		return err;
 
+	err = -ENODEV;
 	devid = superio_inw(sioaddr, SIO_REG_MANID);
 	if (devid != SIO_FINTEK_ID)
 		goto exit;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hwmon/pc87427.c linux-libre-4.14.123-gnu/drivers/hwmon/pc87427.c
--- linux-libre-4.14.122-gnu/drivers/hwmon/pc87427.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hwmon/pc87427.c	2019-05-31 09:47:36.000000000 -0400
@@ -106,6 +106,13 @@ static const char *logdev_str[2] = { DRV
 #define LD_IN		1
 #define LD_TEMP		1
 
+static inline int superio_enter(int sioaddr)
+{
+	if (!request_muxed_region(sioaddr, 2, DRVNAME))
+		return -EBUSY;
+	return 0;
+}
+
 static inline void superio_outb(int sioaddr, int reg, int val)
 {
 	outb(reg, sioaddr);
@@ -122,6 +129,7 @@ static inline void superio_exit(int sioa
 {
 	outb(0x02, sioaddr);
 	outb(0x02, sioaddr + 1);
+	release_region(sioaddr, 2);
 }
 
 /*
@@ -1220,7 +1228,11 @@ static int __init pc87427_find(int sioad
 {
 	u16 val;
 	u8 cfg, cfg_b;
-	int i, err = 0;
+	int i, err;
+
+	err = superio_enter(sioaddr);
+	if (err)
+		return err;
 
 	/* Identify device */
 	val = force_id ? force_id : superio_inb(sioaddr, SIOREG_DEVID);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hwmon/smsc47b397.c linux-libre-4.14.123-gnu/drivers/hwmon/smsc47b397.c
--- linux-libre-4.14.122-gnu/drivers/hwmon/smsc47b397.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hwmon/smsc47b397.c	2019-05-31 09:47:36.000000000 -0400
@@ -72,14 +72,19 @@ static inline void superio_select(int ld
 	superio_outb(0x07, ld);
 }
 
-static inline void superio_enter(void)
+static inline int superio_enter(void)
 {
+	if (!request_muxed_region(REG, 2, DRVNAME))
+		return -EBUSY;
+
 	outb(0x55, REG);
+	return 0;
 }
 
 static inline void superio_exit(void)
 {
 	outb(0xAA, REG);
+	release_region(REG, 2);
 }
 
 #define SUPERIO_REG_DEVID	0x20
@@ -300,8 +305,12 @@ static int __init smsc47b397_find(void)
 	u8 id, rev;
 	char *name;
 	unsigned short addr;
+	int err;
+
+	err = superio_enter();
+	if (err)
+		return err;
 
-	superio_enter();
 	id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
 
 	switch (id) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hwmon/smsc47m1.c linux-libre-4.14.123-gnu/drivers/hwmon/smsc47m1.c
--- linux-libre-4.14.122-gnu/drivers/hwmon/smsc47m1.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hwmon/smsc47m1.c	2019-05-31 09:47:36.000000000 -0400
@@ -73,16 +73,21 @@ superio_inb(int reg)
 /* logical device for fans is 0x0A */
 #define superio_select() superio_outb(0x07, 0x0A)
 
-static inline void
+static inline int
 superio_enter(void)
 {
+	if (!request_muxed_region(REG, 2, DRVNAME))
+		return -EBUSY;
+
 	outb(0x55, REG);
+	return 0;
 }
 
 static inline void
 superio_exit(void)
 {
 	outb(0xAA, REG);
+	release_region(REG, 2);
 }
 
 #define SUPERIO_REG_ACT		0x30
@@ -531,8 +536,12 @@ static int __init smsc47m1_find(struct s
 {
 	u8 val;
 	unsigned short addr;
+	int err;
+
+	err = superio_enter();
+	if (err)
+		return err;
 
-	superio_enter();
 	val = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
 
 	/*
@@ -608,13 +617,14 @@ static int __init smsc47m1_find(struct s
 static void smsc47m1_restore(const struct smsc47m1_sio_data *sio_data)
 {
 	if ((sio_data->activate & 0x01) == 0) {
-		superio_enter();
-		superio_select();
-
-		pr_info("Disabling device\n");
-		superio_outb(SUPERIO_REG_ACT, sio_data->activate);
-
-		superio_exit();
+		if (!superio_enter()) {
+			superio_select();
+			pr_info("Disabling device\n");
+			superio_outb(SUPERIO_REG_ACT, sio_data->activate);
+			superio_exit();
+		} else {
+			pr_warn("Failed to disable device\n");
+		}
 	}
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/hwmon/vt1211.c linux-libre-4.14.123-gnu/drivers/hwmon/vt1211.c
--- linux-libre-4.14.122-gnu/drivers/hwmon/vt1211.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/hwmon/vt1211.c	2019-05-31 09:47:36.000000000 -0400
@@ -226,15 +226,21 @@ static inline void superio_select(int si
 	outb(ldn, sio_cip + 1);
 }
 
-static inline void superio_enter(int sio_cip)
+static inline int superio_enter(int sio_cip)
 {
+	if (!request_muxed_region(sio_cip, 2, DRVNAME))
+		return -EBUSY;
+
 	outb(0x87, sio_cip);
 	outb(0x87, sio_cip);
+
+	return 0;
 }
 
 static inline void superio_exit(int sio_cip)
 {
 	outb(0xaa, sio_cip);
+	release_region(sio_cip, 2);
 }
 
 /* ---------------------------------------------------------------------
@@ -1282,11 +1288,14 @@ EXIT:
 
 static int __init vt1211_find(int sio_cip, unsigned short *address)
 {
-	int err = -ENODEV;
+	int err;
 	int devid;
 
-	superio_enter(sio_cip);
+	err = superio_enter(sio_cip);
+	if (err)
+		return err;
 
+	err = -ENODEV;
 	devid = force_id ? force_id : superio_inb(sio_cip, SIO_VT1211_DEVID);
 	if (devid != SIO_VT1211_ID)
 		goto EXIT;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/iio/adc/ad_sigma_delta.c linux-libre-4.14.123-gnu/drivers/iio/adc/ad_sigma_delta.c
--- linux-libre-4.14.122-gnu/drivers/iio/adc/ad_sigma_delta.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/iio/adc/ad_sigma_delta.c	2019-05-31 09:47:36.000000000 -0400
@@ -62,7 +62,7 @@ int ad_sd_write_reg(struct ad_sigma_delt
 	struct spi_transfer t = {
 		.tx_buf		= data,
 		.len		= size + 1,
-		.cs_change	= sigma_delta->bus_locked,
+		.cs_change	= sigma_delta->keep_cs_asserted,
 	};
 	struct spi_message m;
 	int ret;
@@ -217,6 +217,7 @@ static int ad_sd_calibrate(struct ad_sig
 
 	spi_bus_lock(sigma_delta->spi->master);
 	sigma_delta->bus_locked = true;
+	sigma_delta->keep_cs_asserted = true;
 	reinit_completion(&sigma_delta->completion);
 
 	ret = ad_sigma_delta_set_mode(sigma_delta, mode);
@@ -234,9 +235,10 @@ static int ad_sd_calibrate(struct ad_sig
 		ret = 0;
 	}
 out:
+	sigma_delta->keep_cs_asserted = false;
+	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
 	sigma_delta->bus_locked = false;
 	spi_bus_unlock(sigma_delta->spi->master);
-	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
 
 	return ret;
 }
@@ -288,6 +290,7 @@ int ad_sigma_delta_single_conversion(str
 
 	spi_bus_lock(sigma_delta->spi->master);
 	sigma_delta->bus_locked = true;
+	sigma_delta->keep_cs_asserted = true;
 	reinit_completion(&sigma_delta->completion);
 
 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_SINGLE);
@@ -297,9 +300,6 @@ int ad_sigma_delta_single_conversion(str
 	ret = wait_for_completion_interruptible_timeout(
 			&sigma_delta->completion, HZ);
 
-	sigma_delta->bus_locked = false;
-	spi_bus_unlock(sigma_delta->spi->master);
-
 	if (ret == 0)
 		ret = -EIO;
 	if (ret < 0)
@@ -315,7 +315,10 @@ out:
 		sigma_delta->irq_dis = true;
 	}
 
+	sigma_delta->keep_cs_asserted = false;
 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
+	sigma_delta->bus_locked = false;
+	spi_bus_unlock(sigma_delta->spi->master);
 	mutex_unlock(&indio_dev->mlock);
 
 	if (ret)
@@ -352,6 +355,8 @@ static int ad_sd_buffer_postenable(struc
 
 	spi_bus_lock(sigma_delta->spi->master);
 	sigma_delta->bus_locked = true;
+	sigma_delta->keep_cs_asserted = true;
+
 	ret = ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_CONTINUOUS);
 	if (ret)
 		goto err_unlock;
@@ -380,6 +385,7 @@ static int ad_sd_buffer_postdisable(stru
 		sigma_delta->irq_dis = true;
 	}
 
+	sigma_delta->keep_cs_asserted = false;
 	ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE);
 
 	sigma_delta->bus_locked = false;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/iio/common/ssp_sensors/ssp_iio.c linux-libre-4.14.123-gnu/drivers/iio/common/ssp_sensors/ssp_iio.c
--- linux-libre-4.14.122-gnu/drivers/iio/common/ssp_sensors/ssp_iio.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/iio/common/ssp_sensors/ssp_iio.c	2019-05-31 09:47:36.000000000 -0400
@@ -81,7 +81,7 @@ int ssp_common_process_data(struct iio_d
 			    unsigned int len, int64_t timestamp)
 {
 	__le32 time;
-	int64_t calculated_time;
+	int64_t calculated_time = 0;
 	struct ssp_sensor_data *spd = iio_priv(indio_dev);
 
 	if (indio_dev->scan_bytes == 0)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/iio/magnetometer/hmc5843_i2c.c linux-libre-4.14.123-gnu/drivers/iio/magnetometer/hmc5843_i2c.c
--- linux-libre-4.14.122-gnu/drivers/iio/magnetometer/hmc5843_i2c.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/iio/magnetometer/hmc5843_i2c.c	2019-05-31 09:47:36.000000000 -0400
@@ -58,8 +58,13 @@ static const struct regmap_config hmc584
 static int hmc5843_i2c_probe(struct i2c_client *cli,
 			     const struct i2c_device_id *id)
 {
+	struct regmap *regmap = devm_regmap_init_i2c(cli,
+			&hmc5843_i2c_regmap_config);
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
+
 	return hmc5843_common_probe(&cli->dev,
-			devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config),
+			regmap,
 			id->driver_data, id->name);
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/iio/magnetometer/hmc5843_spi.c linux-libre-4.14.123-gnu/drivers/iio/magnetometer/hmc5843_spi.c
--- linux-libre-4.14.122-gnu/drivers/iio/magnetometer/hmc5843_spi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/iio/magnetometer/hmc5843_spi.c	2019-05-31 09:47:36.000000000 -0400
@@ -58,6 +58,7 @@ static const struct regmap_config hmc584
 static int hmc5843_spi_probe(struct spi_device *spi)
 {
 	int ret;
+	struct regmap *regmap;
 	const struct spi_device_id *id = spi_get_device_id(spi);
 
 	spi->mode = SPI_MODE_3;
@@ -67,8 +68,12 @@ static int hmc5843_spi_probe(struct spi_
 	if (ret)
 		return ret;
 
+	regmap = devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config);
+	if (IS_ERR(regmap))
+		return PTR_ERR(regmap);
+
 	return hmc5843_common_probe(&spi->dev,
-			devm_regmap_init_spi(spi, &hmc5843_spi_regmap_config),
+			regmap,
 			id->driver_data, id->name);
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/infiniband/hw/cxgb4/cm.c linux-libre-4.14.123-gnu/drivers/infiniband/hw/cxgb4/cm.c
--- linux-libre-4.14.122-gnu/drivers/infiniband/hw/cxgb4/cm.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/infiniband/hw/cxgb4/cm.c	2019-05-31 09:47:36.000000000 -0400
@@ -456,6 +456,8 @@ static struct sk_buff *get_skb(struct sk
 		skb_reset_transport_header(skb);
 	} else {
 		skb = alloc_skb(len, gfp);
+		if (!skb)
+			return NULL;
 	}
 	t4_set_arp_err_handler(skb, NULL, NULL);
 	return skb;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/infiniband/hw/hfi1/init.c linux-libre-4.14.123-gnu/drivers/infiniband/hw/hfi1/init.c
--- linux-libre-4.14.122-gnu/drivers/infiniband/hw/hfi1/init.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/infiniband/hw/hfi1/init.c	2019-05-31 09:47:36.000000000 -0400
@@ -769,7 +769,8 @@ static int create_workqueues(struct hfi1
 			ppd->hfi1_wq =
 				alloc_workqueue(
 				    "hfi%d_%d",
-				    WQ_SYSFS | WQ_HIGHPRI | WQ_CPU_INTENSIVE,
+				    WQ_SYSFS | WQ_HIGHPRI | WQ_CPU_INTENSIVE |
+				    WQ_MEM_RECLAIM,
 				    HFI1_MAX_ACTIVE_WORKQUEUE_ENTRIES,
 				    dd->unit, pidx);
 			if (!ppd->hfi1_wq)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/infiniband/hw/hns/hns_roce_ah.c linux-libre-4.14.123-gnu/drivers/infiniband/hw/hns/hns_roce_ah.c
--- linux-libre-4.14.122-gnu/drivers/infiniband/hw/hns/hns_roce_ah.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/infiniband/hw/hns/hns_roce_ah.c	2019-05-31 09:47:36.000000000 -0400
@@ -91,7 +91,7 @@ struct ib_ah *hns_roce_create_ah(struct
 			     HNS_ROCE_VLAN_SL_BIT_MASK) <<
 			     HNS_ROCE_VLAN_SL_SHIFT;
 
-	ah->av.port_pd = cpu_to_be32(to_hr_pd(ibpd)->pdn |
+	ah->av.port_pd = cpu_to_le32(to_hr_pd(ibpd)->pdn |
 				     (rdma_ah_get_port_num(ah_attr) <<
 				     HNS_ROCE_PORT_NUM_SHIFT));
 	ah->av.gid_index = grh->sgid_index;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/md/bcache/alloc.c linux-libre-4.14.123-gnu/drivers/md/bcache/alloc.c
--- linux-libre-4.14.122-gnu/drivers/md/bcache/alloc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/md/bcache/alloc.c	2019-05-31 09:47:36.000000000 -0400
@@ -325,10 +325,11 @@ static int bch_allocator_thread(void *ar
 		 * possibly issue discards to them, then we add the bucket to
 		 * the free list:
 		 */
-		while (!fifo_empty(&ca->free_inc)) {
+		while (1) {
 			long bucket;
 
-			fifo_pop(&ca->free_inc, bucket);
+			if (!fifo_pop(&ca->free_inc, bucket))
+				break;
 
 			if (ca->discard) {
 				mutex_unlock(&ca->set->bucket_lock);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/md/bcache/journal.c linux-libre-4.14.123-gnu/drivers/md/bcache/journal.c
--- linux-libre-4.14.122-gnu/drivers/md/bcache/journal.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/md/bcache/journal.c	2019-05-31 09:47:36.000000000 -0400
@@ -310,6 +310,18 @@ void bch_journal_mark(struct cache_set *
 	}
 }
 
+bool is_discard_enabled(struct cache_set *s)
+{
+	struct cache *ca;
+	unsigned int i;
+
+	for_each_cache(ca, s, i)
+		if (ca->discard)
+			return true;
+
+	return false;
+}
+
 int bch_journal_replay(struct cache_set *s, struct list_head *list)
 {
 	int ret = 0, keys = 0, entries = 0;
@@ -323,9 +335,17 @@ int bch_journal_replay(struct cache_set
 	list_for_each_entry(i, list, list) {
 		BUG_ON(i->pin && atomic_read(i->pin) != 1);
 
-		cache_set_err_on(n != i->j.seq, s,
-"bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)",
-				 n, i->j.seq - 1, start, end);
+		if (n != i->j.seq) {
+			if (n == start && is_discard_enabled(s))
+				pr_info("bcache: journal entries %llu-%llu may be discarded! (replaying %llu-%llu)",
+					n, i->j.seq - 1, start, end);
+			else {
+				pr_err("bcache: journal entries %llu-%llu missing! (replaying %llu-%llu)",
+					n, i->j.seq - 1, start, end);
+				ret = -EIO;
+				goto err;
+			}
+		}
 
 		for (k = i->j.start;
 		     k < bset_bkey_last(&i->j);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/md/bcache/super.c linux-libre-4.14.123-gnu/drivers/md/bcache/super.c
--- linux-libre-4.14.122-gnu/drivers/md/bcache/super.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/md/bcache/super.c	2019-05-31 09:47:36.000000000 -0400
@@ -1560,7 +1560,7 @@ err:
 	return NULL;
 }
 
-static void run_cache_set(struct cache_set *c)
+static int run_cache_set(struct cache_set *c)
 {
 	const char *err = "cannot allocate memory";
 	struct cached_dev *dc, *t;
@@ -1652,7 +1652,9 @@ static void run_cache_set(struct cache_s
 		if (j->version < BCACHE_JSET_VERSION_UUID)
 			__uuid_write(c);
 
-		bch_journal_replay(c, &journal);
+		err = "bcache: replay journal failed";
+		if (bch_journal_replay(c, &journal))
+			goto err;
 	} else {
 		pr_notice("invalidating existing data");
 
@@ -1720,11 +1722,13 @@ static void run_cache_set(struct cache_s
 	flash_devs_run(c);
 
 	set_bit(CACHE_SET_RUNNING, &c->flags);
-	return;
+	return 0;
 err:
 	closure_sync(&cl);
 	/* XXX: test this, it's broken */
 	bch_cache_set_error(c, "%s", err);
+
+	return -EIO;
 }
 
 static bool can_attach_cache(struct cache *ca, struct cache_set *c)
@@ -1788,8 +1792,11 @@ found:
 	ca->set->cache[ca->sb.nr_this_dev] = ca;
 	c->cache_by_alloc[c->caches_loaded++] = ca;
 
-	if (c->caches_loaded == c->sb.nr_in_set)
-		run_cache_set(c);
+	if (c->caches_loaded == c->sb.nr_in_set) {
+		err = "failed to run cache set";
+		if (run_cache_set(c) < 0)
+			goto err;
+	}
 
 	return NULL;
 err:
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/dvb-frontends/m88ds3103.c linux-libre-4.14.123-gnu/drivers/media/dvb-frontends/m88ds3103.c
--- linux-libre-4.14.122-gnu/drivers/media/dvb-frontends/m88ds3103.c	2019-05-26 00:42:54.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/dvb-frontends/m88ds3103.c	2019-05-31 18:22:00.000000000 -0400
@@ -309,6 +309,9 @@ static int m88ds3103_set_frontend(struct
 	u16 u16tmp;
 	u32 tuner_frequency_khz, target_mclk;
 	s32 s32tmp;
+	static const struct reg_sequence reset_buf[] = {
+		{0x07, 0x80}, {0x07, 0x00}
+	};
 
 	dev_dbg(&client->dev,
 		"delivery_system=%d modulation=%d frequency=%u symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
@@ -321,11 +324,7 @@ static int m88ds3103_set_frontend(struct
 	}
 
 	/* reset */
-	ret = regmap_write(dev->regmap, 0x07, 0x80);
-	if (ret)
-		goto err;
-
-	ret = regmap_write(dev->regmap, 0x07, 0x00);
+	ret = regmap_multi_reg_write(dev->regmap, reset_buf, 2);
 	if (ret)
 		goto err;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/i2c/ov2659.c linux-libre-4.14.123-gnu/drivers/media/i2c/ov2659.c
--- linux-libre-4.14.122-gnu/drivers/media/i2c/ov2659.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/i2c/ov2659.c	2019-05-31 09:47:36.000000000 -0400
@@ -1117,8 +1117,10 @@ static int ov2659_set_fmt(struct v4l2_su
 		if (ov2659_formats[index].code == mf->code)
 			break;
 
-	if (index < 0)
-		return -EINVAL;
+	if (index < 0) {
+		index = 0;
+		mf->code = ov2659_formats[index].code;
+	}
 
 	mf->colorspace = V4L2_COLORSPACE_SRGB;
 	mf->field = V4L2_FIELD_NONE;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/i2c/ov6650.c linux-libre-4.14.123-gnu/drivers/media/i2c/ov6650.c
--- linux-libre-4.14.122-gnu/drivers/media/i2c/ov6650.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/i2c/ov6650.c	2019-05-31 09:47:36.000000000 -0400
@@ -822,9 +822,16 @@ static int ov6650_video_probe(struct i2c
 	u8		pidh, pidl, midh, midl;
 	int		ret;
 
+	priv->clk = v4l2_clk_get(&client->dev, NULL);
+	if (IS_ERR(priv->clk)) {
+		ret = PTR_ERR(priv->clk);
+		dev_err(&client->dev, "v4l2_clk request err: %d\n", ret);
+		return ret;
+	}
+
 	ret = ov6650_s_power(&priv->subdev, 1);
 	if (ret < 0)
-		return ret;
+		goto eclkput;
 
 	msleep(20);
 
@@ -861,6 +868,11 @@ static int ov6650_video_probe(struct i2c
 
 done:
 	ov6650_s_power(&priv->subdev, 0);
+	if (!ret)
+		return 0;
+eclkput:
+	v4l2_clk_put(priv->clk);
+
 	return ret;
 }
 
@@ -1006,18 +1018,9 @@ static int ov6650_probe(struct i2c_clien
 	priv->code	  = MEDIA_BUS_FMT_YUYV8_2X8;
 	priv->colorspace  = V4L2_COLORSPACE_JPEG;
 
-	priv->clk = v4l2_clk_get(&client->dev, NULL);
-	if (IS_ERR(priv->clk)) {
-		ret = PTR_ERR(priv->clk);
-		goto eclkget;
-	}
-
 	ret = ov6650_video_probe(client);
-	if (ret) {
-		v4l2_clk_put(priv->clk);
-eclkget:
+	if (ret)
 		v4l2_ctrl_handler_free(&priv->hdl);
-	}
 
 	return ret;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/pci/saa7146/hexium_gemini.c linux-libre-4.14.123-gnu/drivers/media/pci/saa7146/hexium_gemini.c
--- linux-libre-4.14.122-gnu/drivers/media/pci/saa7146/hexium_gemini.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/pci/saa7146/hexium_gemini.c	2019-05-31 09:47:36.000000000 -0400
@@ -270,9 +270,8 @@ static int hexium_attach(struct saa7146_
 	/* enable i2c-port pins */
 	saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
 
-	hexium->i2c_adapter = (struct i2c_adapter) {
-		.name = "hexium gemini",
-	};
+	strscpy(hexium->i2c_adapter.name, "hexium gemini",
+		sizeof(hexium->i2c_adapter.name));
 	saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
 	if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
 		DEB_S("cannot register i2c-device. skipping.\n");
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/pci/saa7146/hexium_orion.c linux-libre-4.14.123-gnu/drivers/media/pci/saa7146/hexium_orion.c
--- linux-libre-4.14.122-gnu/drivers/media/pci/saa7146/hexium_orion.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/pci/saa7146/hexium_orion.c	2019-05-31 09:47:36.000000000 -0400
@@ -232,9 +232,8 @@ static int hexium_probe(struct saa7146_d
 	saa7146_write(dev, DD1_STREAM_B, 0x00000000);
 	saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
 
-	hexium->i2c_adapter = (struct i2c_adapter) {
-		.name = "hexium orion",
-	};
+	strscpy(hexium->i2c_adapter.name, "hexium orion",
+		sizeof(hexium->i2c_adapter.name));
 	saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
 	if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
 		DEB_S("cannot register i2c-device. skipping.\n");
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/coda/coda-bit.c linux-libre-4.14.123-gnu/drivers/media/platform/coda/coda-bit.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/coda/coda-bit.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/coda/coda-bit.c	2019-05-31 09:47:36.000000000 -0400
@@ -1948,6 +1948,9 @@ static int coda_prepare_decode(struct co
 	/* Clear decode success flag */
 	coda_write(dev, 0, CODA_RET_DEC_PIC_SUCCESS);
 
+	/* Clear error return value */
+	coda_write(dev, 0, CODA_RET_DEC_PIC_ERR_MB);
+
 	trace_coda_dec_pic_run(ctx, meta);
 
 	coda_command_async(ctx, CODA_COMMAND_PIC_RUN);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/stm32/stm32-dcmi.c linux-libre-4.14.123-gnu/drivers/media/platform/stm32/stm32-dcmi.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/stm32/stm32-dcmi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/stm32/stm32-dcmi.c	2019-05-31 09:47:36.000000000 -0400
@@ -775,6 +775,9 @@ static int dcmi_try_fmt(struct stm32_dcm
 
 	sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat);
 	if (!sd_fmt) {
+		if (!dcmi->num_of_sd_formats)
+			return -ENODATA;
+
 		sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats - 1];
 		pix->pixelformat = sd_fmt->fourcc;
 	}
@@ -946,6 +949,9 @@ static int dcmi_set_sensor_format(struct
 
 	sd_fmt = find_format_by_fourcc(dcmi, pix->pixelformat);
 	if (!sd_fmt) {
+		if (!dcmi->num_of_sd_formats)
+			return -ENODATA;
+
 		sd_fmt = dcmi->sd_formats[dcmi->num_of_sd_formats - 1];
 		pix->pixelformat = sd_fmt->fourcc;
 	}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/video-mux.c linux-libre-4.14.123-gnu/drivers/media/platform/video-mux.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/video-mux.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/video-mux.c	2019-05-31 09:47:36.000000000 -0400
@@ -242,9 +242,14 @@ static int video_mux_probe(struct platfo
 	vmux->active = -1;
 	vmux->pads = devm_kcalloc(dev, num_pads, sizeof(*vmux->pads),
 				  GFP_KERNEL);
+	if (!vmux->pads)
+		return -ENOMEM;
+
 	vmux->format_mbus = devm_kcalloc(dev, num_pads,
 					 sizeof(*vmux->format_mbus),
 					 GFP_KERNEL);
+	if (!vmux->format_mbus)
+		return -ENOMEM;
 
 	for (i = 0; i < num_pads - 1; i++)
 		vmux->pads[i].flags = MEDIA_PAD_FL_SINK;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/vimc/vimc-core.c linux-libre-4.14.123-gnu/drivers/media/platform/vimc/vimc-core.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/vimc/vimc-core.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/vimc/vimc-core.c	2019-05-31 09:47:36.000000000 -0400
@@ -302,6 +302,8 @@ static int vimc_probe(struct platform_de
 
 	dev_dbg(&pdev->dev, "probe");
 
+	memset(&vimc->mdev, 0, sizeof(vimc->mdev));
+
 	/* Create platform_device for each entity in the topology*/
 	vimc->subdevs = devm_kcalloc(&vimc->pdev.dev, vimc->pipe_cfg->num_ents,
 				     sizeof(*vimc->subdevs), GFP_KERNEL);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/vimc/vimc-streamer.c linux-libre-4.14.123-gnu/drivers/media/platform/vimc/vimc-streamer.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/vimc/vimc-streamer.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/vimc/vimc-streamer.c	2019-05-31 09:47:36.000000000 -0400
@@ -120,7 +120,6 @@ static int vimc_streamer_thread(void *da
 	int i;
 
 	set_freezable();
-	set_current_state(TASK_UNINTERRUPTIBLE);
 
 	for (;;) {
 		try_to_freeze();
@@ -137,6 +136,7 @@ static int vimc_streamer_thread(void *da
 				break;
 		}
 		//wait for 60hz
+		set_current_state(TASK_UNINTERRUPTIBLE);
 		schedule_timeout(HZ / 60);
 	}
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/platform/vivid/vivid-vid-cap.c linux-libre-4.14.123-gnu/drivers/media/platform/vivid/vivid-vid-cap.c
--- linux-libre-4.14.122-gnu/drivers/media/platform/vivid/vivid-vid-cap.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/platform/vivid/vivid-vid-cap.c	2019-05-31 09:47:36.000000000 -0400
@@ -1007,7 +1007,7 @@ int vivid_vid_cap_s_selection(struct fil
 		v4l2_rect_map_inside(&s->r, &dev->fmt_cap_rect);
 		if (dev->bitmap_cap && (compose->width != s->r.width ||
 					compose->height != s->r.height)) {
-			kfree(dev->bitmap_cap);
+			vfree(dev->bitmap_cap);
 			dev->bitmap_cap = NULL;
 		}
 		*compose = s->r;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/radio/wl128x/fmdrv_common.c linux-libre-4.14.123-gnu/drivers/media/radio/wl128x/fmdrv_common.c
--- linux-libre-4.14.122-gnu/drivers/media/radio/wl128x/fmdrv_common.c	2019-05-26 00:46:28.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/radio/wl128x/fmdrv_common.c	2019-05-31 18:25:28.000000000 -0400
@@ -489,7 +489,8 @@ int fmc_send_cmd(struct fmdev *fmdev, u8
 		return -EIO;
 	}
 	/* Send response data to caller */
-	if (response != NULL && response_len != NULL && evt_hdr->dlen) {
+	if (response != NULL && response_len != NULL && evt_hdr->dlen &&
+	    evt_hdr->dlen <= payload_len) {
 		/* Skip header info and copy only response data */
 		skb_pull(skb, sizeof(struct fm_event_msg_hdr));
 		memcpy(response, skb->data, evt_hdr->dlen);
@@ -583,6 +584,8 @@ static void fm_irq_handle_flag_getcmd_re
 		return;
 
 	fm_evt_hdr = (void *)skb->data;
+	if (fm_evt_hdr->dlen > sizeof(fmdev->irq_info.flag))
+		return;
 
 	/* Skip header info and copy only response data */
 	skb_pull(skb, sizeof(struct fm_event_msg_hdr));
@@ -1308,7 +1311,7 @@ static int load_default_rx_configuration
 static int fm_power_up(struct fmdev *fmdev, u8 mode)
 {
 	u16 payload;
-	__be16 asic_id, asic_ver;
+	__be16 asic_id = 0, asic_ver = 0;
 	int resp_len, ret;
 	u8 fw_name[50];
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/rc/serial_ir.c linux-libre-4.14.123-gnu/drivers/media/rc/serial_ir.c
--- linux-libre-4.14.122-gnu/drivers/media/rc/serial_ir.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/rc/serial_ir.c	2019-05-31 09:47:36.000000000 -0400
@@ -774,8 +774,6 @@ static void serial_ir_exit(void)
 
 static int __init serial_ir_init_module(void)
 {
-	int result;
-
 	switch (type) {
 	case IR_HOMEBREW:
 	case IR_IRDEO:
@@ -803,12 +801,7 @@ static int __init serial_ir_init_module(
 	if (sense != -1)
 		sense = !!sense;
 
-	result = serial_ir_init();
-	if (!result)
-		return 0;
-
-	serial_ir_exit();
-	return result;
+	return serial_ir_init();
 }
 
 static void __exit serial_ir_exit_module(void)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/usb/au0828/au0828-video.c linux-libre-4.14.123-gnu/drivers/media/usb/au0828/au0828-video.c
--- linux-libre-4.14.122-gnu/drivers/media/usb/au0828/au0828-video.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/usb/au0828/au0828-video.c	2019-05-31 09:47:36.000000000 -0400
@@ -758,6 +758,9 @@ static int au0828_analog_stream_enable(s
 
 	dprintk(1, "au0828_analog_stream_enable called\n");
 
+	if (test_bit(DEV_DISCONNECTED, &d->dev_state))
+		return -ENODEV;
+
 	iface = usb_ifnum_to_if(d->usbdev, 0);
 	if (iface && iface->cur_altsetting->desc.bAlternateSetting != 5) {
 		dprintk(1, "Changing intf#0 to alt 5\n");
@@ -839,9 +842,9 @@ int au0828_start_analog_streaming(struct
 			return rc;
 		}
 
+		v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1);
+
 		if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
-			v4l2_device_call_all(&dev->v4l2_dev, 0, video,
-						s_stream, 1);
 			dev->vid_timeout_running = 1;
 			mod_timer(&dev->vid_timeout, jiffies + (HZ / 10));
 		} else if (vq->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
@@ -861,10 +864,11 @@ static void au0828_stop_streaming(struct
 
 	dprintk(1, "au0828_stop_streaming called %d\n", dev->streaming_users);
 
-	if (dev->streaming_users-- == 1)
+	if (dev->streaming_users-- == 1) {
 		au0828_uninit_isoc(dev);
+		v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
+	}
 
-	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
 	dev->vid_timeout_running = 0;
 	del_timer_sync(&dev->vid_timeout);
 
@@ -893,8 +897,10 @@ void au0828_stop_vbi_streaming(struct vb
 	dprintk(1, "au0828_stop_vbi_streaming called %d\n",
 		dev->streaming_users);
 
-	if (dev->streaming_users-- == 1)
+	if (dev->streaming_users-- == 1) {
 		au0828_uninit_isoc(dev);
+		v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 0);
+	}
 
 	spin_lock_irqsave(&dev->slock, flags);
 	if (dev->isoc_ctl.vbi_buf != NULL) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/usb/cpia2/cpia2_v4l.c linux-libre-4.14.123-gnu/drivers/media/usb/cpia2/cpia2_v4l.c
--- linux-libre-4.14.122-gnu/drivers/media/usb/cpia2/cpia2_v4l.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/usb/cpia2/cpia2_v4l.c	2019-05-31 09:47:36.000000000 -0400
@@ -1244,8 +1244,7 @@ static int __init cpia2_init(void)
 	LOG("%s v%s\n",
 	    ABOUT, CPIA_VERSION);
 	check_parameters();
-	cpia2_usb_init();
-	return 0;
+	return cpia2_usb_init();
 }
 
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/usb/go7007/go7007-fw.c linux-libre-4.14.123-gnu/drivers/media/usb/go7007/go7007-fw.c
--- linux-libre-4.14.122-gnu/drivers/media/usb/go7007/go7007-fw.c	2019-05-26 00:45:46.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/usb/go7007/go7007-fw.c	2019-05-31 18:24:43.000000000 -0400
@@ -1499,8 +1499,8 @@ static int modet_to_package(struct go700
 	return cnt;
 }
 
-static int do_special(struct go7007 *go, u16 type, __le16 *code, int space,
-			int *framelen)
+static noinline_for_stack int do_special(struct go7007 *go, u16 type,
+					 __le16 *code, int space, int *framelen)
 {
 	switch (type) {
 	case SPECIAL_FRM_HEAD:
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.c linux-libre-4.14.123-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
--- linux-libre-4.14.122-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.c	2019-05-26 00:45:32.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.c	2019-05-31 18:24:32.000000000 -0400
@@ -666,6 +666,8 @@ static int ctrl_get_input(struct pvr2_ct
 
 static int ctrl_check_input(struct pvr2_ctrl *cptr,int v)
 {
+	if (v < 0 || v > PVR2_CVAL_INPUT_MAX)
+		return 0;
 	return ((1 << v) & cptr->hdw->input_allowed_mask) != 0;
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.h linux-libre-4.14.123-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.h
--- linux-libre-4.14.122-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/media/usb/pvrusb2/pvrusb2-hdw.h	2019-05-31 09:47:36.000000000 -0400
@@ -50,6 +50,7 @@
 #define PVR2_CVAL_INPUT_COMPOSITE 2
 #define PVR2_CVAL_INPUT_SVIDEO 3
 #define PVR2_CVAL_INPUT_RADIO 4
+#define PVR2_CVAL_INPUT_MAX PVR2_CVAL_INPUT_RADIO
 
 enum pvr2_config {
 	pvr2_config_empty,    /* No configuration */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/mmc/core/pwrseq_emmc.c linux-libre-4.14.123-gnu/drivers/mmc/core/pwrseq_emmc.c
--- linux-libre-4.14.122-gnu/drivers/mmc/core/pwrseq_emmc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/mmc/core/pwrseq_emmc.c	2019-05-31 09:47:36.000000000 -0400
@@ -30,19 +30,14 @@ struct mmc_pwrseq_emmc {
 
 #define to_pwrseq_emmc(p) container_of(p, struct mmc_pwrseq_emmc, pwrseq)
 
-static void __mmc_pwrseq_emmc_reset(struct mmc_pwrseq_emmc *pwrseq)
-{
-	gpiod_set_value(pwrseq->reset_gpio, 1);
-	udelay(1);
-	gpiod_set_value(pwrseq->reset_gpio, 0);
-	udelay(200);
-}
-
 static void mmc_pwrseq_emmc_reset(struct mmc_host *host)
 {
 	struct mmc_pwrseq_emmc *pwrseq =  to_pwrseq_emmc(host->pwrseq);
 
-	__mmc_pwrseq_emmc_reset(pwrseq);
+	gpiod_set_value_cansleep(pwrseq->reset_gpio, 1);
+	udelay(1);
+	gpiod_set_value_cansleep(pwrseq->reset_gpio, 0);
+	udelay(200);
 }
 
 static int mmc_pwrseq_emmc_reset_nb(struct notifier_block *this,
@@ -50,8 +45,11 @@ static int mmc_pwrseq_emmc_reset_nb(stru
 {
 	struct mmc_pwrseq_emmc *pwrseq = container_of(this,
 					struct mmc_pwrseq_emmc, reset_nb);
+	gpiod_set_value(pwrseq->reset_gpio, 1);
+	udelay(1);
+	gpiod_set_value(pwrseq->reset_gpio, 0);
+	udelay(200);
 
-	__mmc_pwrseq_emmc_reset(pwrseq);
 	return NOTIFY_DONE;
 }
 
@@ -72,14 +70,18 @@ static int mmc_pwrseq_emmc_probe(struct
 	if (IS_ERR(pwrseq->reset_gpio))
 		return PTR_ERR(pwrseq->reset_gpio);
 
-	/*
-	 * register reset handler to ensure emmc reset also from
-	 * emergency_reboot(), priority 255 is the highest priority
-	 * so it will be executed before any system reboot handler.
-	 */
-	pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb;
-	pwrseq->reset_nb.priority = 255;
-	register_restart_handler(&pwrseq->reset_nb);
+	if (!gpiod_cansleep(pwrseq->reset_gpio)) {
+		/*
+		 * register reset handler to ensure emmc reset also from
+		 * emergency_reboot(), priority 255 is the highest priority
+		 * so it will be executed before any system reboot handler.
+		 */
+		pwrseq->reset_nb.notifier_call = mmc_pwrseq_emmc_reset_nb;
+		pwrseq->reset_nb.priority = 255;
+		register_restart_handler(&pwrseq->reset_nb);
+	} else {
+		dev_notice(dev, "EMMC reset pin tied to a sleepy GPIO driver; reset on emergency-reboot disabled\n");
+	}
 
 	pwrseq->pwrseq.ops = &mmc_pwrseq_emmc_ops;
 	pwrseq->pwrseq.dev = dev;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/mmc/core/sd.c linux-libre-4.14.123-gnu/drivers/mmc/core/sd.c
--- linux-libre-4.14.122-gnu/drivers/mmc/core/sd.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/mmc/core/sd.c	2019-05-31 09:47:36.000000000 -0400
@@ -216,6 +216,14 @@ static int mmc_decode_scr(struct mmc_car
 
 	if (scr->sda_spec3)
 		scr->cmds = UNSTUFF_BITS(resp, 32, 2);
+
+	/* SD Spec says: any SD Card shall set at least bits 0 and 2 */
+	if (!(scr->bus_widths & SD_SCR_BUS_WIDTH_1) ||
+	    !(scr->bus_widths & SD_SCR_BUS_WIDTH_4)) {
+		pr_err("%s: invalid bus width\n", mmc_hostname(card->host));
+		return -EINVAL;
+	}
+
 	return 0;
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/mmc/host/mmc_spi.c linux-libre-4.14.123-gnu/drivers/mmc/host/mmc_spi.c
--- linux-libre-4.14.122-gnu/drivers/mmc/host/mmc_spi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/mmc/host/mmc_spi.c	2019-05-31 09:47:36.000000000 -0400
@@ -819,6 +819,10 @@ mmc_spi_readblock(struct mmc_spi_host *h
 	}
 
 	status = spi_sync_locked(spi, &host->m);
+	if (status < 0) {
+		dev_dbg(&spi->dev, "read error %d\n", status);
+		return status;
+	}
 
 	if (host->dma_dev) {
 		dma_sync_single_for_cpu(host->dma_dev,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/mmc/host/sdhci-iproc.c linux-libre-4.14.123-gnu/drivers/mmc/host/sdhci-iproc.c
--- linux-libre-4.14.122-gnu/drivers/mmc/host/sdhci-iproc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/mmc/host/sdhci-iproc.c	2019-05-31 09:47:36.000000000 -0400
@@ -185,7 +185,8 @@ static const struct sdhci_ops sdhci_ipro
 };
 
 static const struct sdhci_pltfm_data sdhci_iproc_cygnus_pltfm_data = {
-	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
+	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
+		  SDHCI_QUIRK_NO_HISPD_BIT,
 	.quirks2 = SDHCI_QUIRK2_ACMD23_BROKEN | SDHCI_QUIRK2_HOST_OFF_CARD_ON,
 	.ops = &sdhci_iproc_32only_ops,
 };
@@ -208,7 +209,8 @@ static const struct sdhci_iproc_data ipr
 
 static const struct sdhci_pltfm_data sdhci_iproc_pltfm_data = {
 	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
-		  SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
+		  SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 |
+		  SDHCI_QUIRK_NO_HISPD_BIT,
 	.quirks2 = SDHCI_QUIRK2_ACMD23_BROKEN,
 	.ops = &sdhci_iproc_ops,
 };
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/mmc/host/sdhci-of-esdhc.c linux-libre-4.14.123-gnu/drivers/mmc/host/sdhci-of-esdhc.c
--- linux-libre-4.14.122-gnu/drivers/mmc/host/sdhci-of-esdhc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/mmc/host/sdhci-of-esdhc.c	2019-05-31 09:47:36.000000000 -0400
@@ -610,6 +610,9 @@ static void esdhc_reset(struct sdhci_hos
 	sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
 	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
 
+	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc"))
+		mdelay(5);
+
 	if (mask & SDHCI_RESET_ALL) {
 		val = sdhci_readl(host, ESDHC_TBCTL);
 		val &= ~ESDHC_TB_EN;
@@ -880,6 +883,11 @@ static int sdhci_esdhc_probe(struct plat
 	if (esdhc->vendor_ver > VENDOR_V_22)
 		host->quirks &= ~SDHCI_QUIRK_NO_BUSY_IRQ;
 
+	if (of_find_compatible_node(NULL, NULL, "fsl,p2020-esdhc")) {
+		host->quirks2 |= SDHCI_QUIRK_RESET_AFTER_REQUEST;
+		host->quirks2 |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+	}
+
 	if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||
 	    of_device_is_compatible(np, "fsl,p5020-esdhc") ||
 	    of_device_is_compatible(np, "fsl,p4080-esdhc") ||
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/ethernet/amazon/ena/ena_netdev.c linux-libre-4.14.123-gnu/drivers/net/ethernet/amazon/ena/ena_netdev.c
--- linux-libre-4.14.122-gnu/drivers/net/ethernet/amazon/ena/ena_netdev.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/ethernet/amazon/ena/ena_netdev.c	2019-05-31 09:47:36.000000000 -0400
@@ -2229,7 +2229,7 @@ static void ena_config_host_info(struct
 
 	host_info->os_type = ENA_ADMIN_OS_LINUX;
 	host_info->kernel_ver = LINUX_VERSION_CODE;
-	strncpy(host_info->kernel_ver_str, utsname()->version,
+	strlcpy(host_info->kernel_ver_str, utsname()->version,
 		sizeof(host_info->kernel_ver_str) - 1);
 	host_info->os_dist = 0;
 	strncpy(host_info->os_dist_str, utsname()->release,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/ethernet/chelsio/cxgb3/l2t.h linux-libre-4.14.123-gnu/drivers/net/ethernet/chelsio/cxgb3/l2t.h
--- linux-libre-4.14.122-gnu/drivers/net/ethernet/chelsio/cxgb3/l2t.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/ethernet/chelsio/cxgb3/l2t.h	2019-05-31 09:47:36.000000000 -0400
@@ -75,8 +75,8 @@ struct l2t_data {
 	struct l2t_entry *rover;	/* starting point for next allocation */
 	atomic_t nfree;		/* number of free entries */
 	rwlock_t lock;
-	struct l2t_entry l2tab[0];
 	struct rcu_head rcu_head;	/* to handle rcu cleanup */
+	struct l2t_entry l2tab[];
 };
 
 typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c linux-libre-4.14.123-gnu/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
--- linux-libre-4.14.122-gnu/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	2019-05-26 00:47:29.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	2019-05-31 18:26:29.000000000 -0400
@@ -5397,15 +5397,24 @@ static int __init cxgb4_init_module(void
 
 	ret = pci_register_driver(&cxgb4_driver);
 	if (ret < 0)
-		debugfs_remove(cxgb4_debugfs_root);
+		goto err_pci;
 
 #if IS_ENABLED(CONFIG_IPV6)
 	if (!inet6addr_registered) {
-		register_inet6addr_notifier(&cxgb4_inet6addr_notifier);
-		inet6addr_registered = true;
+		ret = register_inet6addr_notifier(&cxgb4_inet6addr_notifier);
+		if (ret)
+			pci_unregister_driver(&cxgb4_driver);
+		else
+			inet6addr_registered = true;
 	}
 #endif
 
+	if (ret == 0)
+		return ret;
+
+err_pci:
+	debugfs_remove(cxgb4_debugfs_root);
+
 	return ret;
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/ethernet/intel/i40e/i40e_main.c linux-libre-4.14.123-gnu/drivers/net/ethernet/intel/i40e/i40e_main.c
--- linux-libre-4.14.122-gnu/drivers/net/ethernet/intel/i40e/i40e_main.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/ethernet/intel/i40e/i40e_main.c	2019-05-31 09:47:36.000000000 -0400
@@ -2499,6 +2499,10 @@ void i40e_vlan_stripping_enable(struct i
 	struct i40e_vsi_context ctxt;
 	i40e_status ret;
 
+	/* Don't modify stripping options if a port VLAN is active */
+	if (vsi->info.pvid)
+		return;
+
 	if ((vsi->info.valid_sections &
 	     cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) &&
 	    ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_MODE_MASK) == 0))
@@ -2529,6 +2533,10 @@ void i40e_vlan_stripping_disable(struct
 	struct i40e_vsi_context ctxt;
 	i40e_status ret;
 
+	/* Don't modify stripping options if a port VLAN is active */
+	if (vsi->info.pvid)
+		return;
+
 	if ((vsi->info.valid_sections &
 	     cpu_to_le16(I40E_AQ_VSI_PROP_VLAN_VALID)) &&
 	    ((vsi->info.port_vlan_flags & I40E_AQ_VSI_PVLAN_EMOD_MASK) ==
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c linux-libre-4.14.123-gnu/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
--- linux-libre-4.14.122-gnu/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c	2019-05-31 09:47:36.000000000 -0400
@@ -2029,8 +2029,10 @@ error_param:
 				      (u8 *)&stats, sizeof(stats));
 }
 
-/* If the VF is not trusted restrict the number of MAC/VLAN it can program */
-#define I40E_VC_MAX_MAC_ADDR_PER_VF 12
+/* If the VF is not trusted restrict the number of MAC/VLAN it can program
+ * MAC filters: 16 for multicast, 1 for MAC, 1 for broadcast
+ */
+#define I40E_VC_MAX_MAC_ADDR_PER_VF (16 + 1 + 1)
 #define I40E_VC_MAX_VLAN_PER_VF 8
 
 /**
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/atmel/at76c50x-usb.c linux-libre-4.14.123-gnu/drivers/net/wireless/atmel/at76c50x-usb.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/atmel/at76c50x-usb.c	2019-05-26 00:49:37.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/atmel/at76c50x-usb.c	2019-05-31 18:28:36.000000000 -0400
@@ -2578,8 +2578,8 @@ static int __init at76_mod_init(void)
 	if (result < 0)
 		printk(KERN_ERR DRIVER_NAME
 		       ": usb_register failed (status %d)\n", result);
-
-	led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
+	else
+		led_trigger_register_simple("at76_usb-tx", &ledtrig_tx);
 	return result;
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/b43/phy_lp.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/b43/phy_lp.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/b43/phy_lp.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/b43/phy_lp.c	2019-05-31 09:47:36.000000000 -0400
@@ -1834,7 +1834,7 @@ static void lpphy_papd_cal(struct b43_wl
 static void lpphy_papd_cal_txpwr(struct b43_wldev *dev)
 {
 	struct b43_phy_lp *lpphy = dev->phy.lp;
-	struct lpphy_tx_gains gains, oldgains;
+	struct lpphy_tx_gains oldgains;
 	int old_txpctl, old_afe_ovr, old_rf, old_bbmult;
 
 	lpphy_read_tx_pctl_mode_from_hardware(dev);
@@ -1848,9 +1848,9 @@ static void lpphy_papd_cal_txpwr(struct
 	lpphy_set_tx_power_control(dev, B43_LPPHY_TXPCTL_OFF);
 
 	if (dev->dev->chip_id == 0x4325 && dev->dev->chip_rev == 0)
-		lpphy_papd_cal(dev, gains, 0, 1, 30);
+		lpphy_papd_cal(dev, oldgains, 0, 1, 30);
 	else
-		lpphy_papd_cal(dev, gains, 0, 1, 65);
+		lpphy_papd_cal(dev, oldgains, 0, 1, 65);
 
 	if (old_afe_ovr)
 		lpphy_set_tx_gains(dev, oldgains);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c	2019-05-31 09:47:36.000000000 -0400
@@ -3581,6 +3581,8 @@ brcmf_wowl_nd_results(struct brcmf_if *i
 	}
 
 	netinfo = brcmf_get_netinfo_array(pfn_result);
+	if (netinfo->SSID_len > IEEE80211_MAX_SSID_LEN)
+		netinfo->SSID_len = IEEE80211_MAX_SSID_LEN;
 	memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len);
 	cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len;
 	cfg->wowl.nd->n_channels = 1;
@@ -5465,6 +5467,8 @@ static s32 brcmf_get_assoc_ies(struct br
 		conn_info->req_ie =
 		    kmemdup(cfg->extra_buf, conn_info->req_ie_len,
 			    GFP_KERNEL);
+		if (!conn_info->req_ie)
+			conn_info->req_ie_len = 0;
 	} else {
 		conn_info->req_ie_len = 0;
 		conn_info->req_ie = NULL;
@@ -5481,6 +5485,8 @@ static s32 brcmf_get_assoc_ies(struct br
 		conn_info->resp_ie =
 		    kmemdup(cfg->extra_buf, conn_info->resp_ie_len,
 			    GFP_KERNEL);
+		if (!conn_info->resp_ie)
+			conn_info->resp_ie_len = 0;
 	} else {
 		conn_info->resp_ie_len = 0;
 		conn_info->resp_ie = NULL;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c	2019-05-31 09:47:36.000000000 -0400
@@ -344,7 +344,8 @@ void brcmf_rx_frame(struct device *dev,
 	} else {
 		/* Process special event packets */
 		if (handle_event)
-			brcmf_fweh_process_skb(ifp->drvr, skb);
+			brcmf_fweh_process_skb(ifp->drvr, skb,
+					       BCMILCP_SUBTYPE_VENDOR_LONG);
 
 		brcmf_netif_rx(ifp, skb);
 	}
@@ -361,7 +362,7 @@ void brcmf_rx_event(struct device *dev,
 	if (brcmf_rx_hdrpull(drvr, skb, &ifp))
 		return;
 
-	brcmf_fweh_process_skb(ifp->drvr, skb);
+	brcmf_fweh_process_skb(ifp->drvr, skb, 0);
 	brcmu_pkt_buf_free_skb(skb);
 }
 
@@ -663,17 +664,17 @@ static void brcmf_del_if(struct brcmf_pu
 			 bool rtnl_locked)
 {
 	struct brcmf_if *ifp;
+	int ifidx;
 
 	ifp = drvr->iflist[bsscfgidx];
-	drvr->iflist[bsscfgidx] = NULL;
 	if (!ifp) {
 		brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);
 		return;
 	}
 	brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
 		  ifp->ifidx);
-	if (drvr->if2bss[ifp->ifidx] == bsscfgidx)
-		drvr->if2bss[ifp->ifidx] = BRCMF_BSSIDX_INVALID;
+	ifidx = ifp->ifidx;
+
 	if (ifp->ndev) {
 		if (bsscfgidx == 0) {
 			if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
@@ -701,6 +702,10 @@ static void brcmf_del_if(struct brcmf_pu
 		brcmf_p2p_ifp_removed(ifp, rtnl_locked);
 		kfree(ifp);
 	}
+
+	drvr->iflist[bsscfgidx] = NULL;
+	if (drvr->if2bss[ifidx] == bsscfgidx)
+		drvr->if2bss[ifidx] = BRCMF_BSSIDX_INVALID;
 }
 
 void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h	2019-05-31 09:47:36.000000000 -0400
@@ -211,7 +211,7 @@ enum brcmf_fweh_event_code {
  */
 #define BRCM_OUI				"\x00\x10\x18"
 #define BCMILCP_BCM_SUBTYPE_EVENT		1
-
+#define BCMILCP_SUBTYPE_VENDOR_LONG		32769
 
 /**
  * struct brcm_ethhdr - broadcom specific ether header.
@@ -334,10 +334,10 @@ void brcmf_fweh_process_event(struct brc
 void brcmf_fweh_p2pdev_setup(struct brcmf_if *ifp, bool ongoing);
 
 static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
-					  struct sk_buff *skb)
+					  struct sk_buff *skb, u16 stype)
 {
 	struct brcmf_event *event_packet;
-	u16 usr_stype;
+	u16 subtype, usr_stype;
 
 	/* only process events when protocol matches */
 	if (skb->protocol != cpu_to_be16(ETH_P_LINK_CTL))
@@ -346,8 +346,16 @@ static inline void brcmf_fweh_process_sk
 	if ((skb->len + ETH_HLEN) < sizeof(*event_packet))
 		return;
 
-	/* check for BRCM oui match */
 	event_packet = (struct brcmf_event *)skb_mac_header(skb);
+
+	/* check subtype if needed */
+	if (unlikely(stype)) {
+		subtype = get_unaligned_be16(&event_packet->hdr.subtype);
+		if (subtype != stype)
+			return;
+	}
+
+	/* check for BRCM oui match */
 	if (memcmp(BRCM_OUI, &event_packet->hdr.oui[0],
 		   sizeof(event_packet->hdr.oui)))
 		return;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c	2019-05-31 09:47:36.000000000 -0400
@@ -579,24 +579,6 @@ static bool brcmf_fws_ifidx_match(struct
 	return ifidx == *(int *)arg;
 }
 
-static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,
-				int ifidx)
-{
-	bool (*matchfn)(struct sk_buff *, void *) = NULL;
-	struct sk_buff *skb;
-	int prec;
-
-	if (ifidx != -1)
-		matchfn = brcmf_fws_ifidx_match;
-	for (prec = 0; prec < q->num_prec; prec++) {
-		skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
-		while (skb) {
-			brcmu_pkt_buf_free_skb(skb);
-			skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
-		}
-	}
-}
-
 static void brcmf_fws_hanger_init(struct brcmf_fws_hanger *hanger)
 {
 	int i;
@@ -668,6 +650,28 @@ static inline int brcmf_fws_hanger_poppk
 	return 0;
 }
 
+static void brcmf_fws_psq_flush(struct brcmf_fws_info *fws, struct pktq *q,
+				int ifidx)
+{
+	bool (*matchfn)(struct sk_buff *, void *) = NULL;
+	struct sk_buff *skb;
+	int prec;
+	u32 hslot;
+
+	if (ifidx != -1)
+		matchfn = brcmf_fws_ifidx_match;
+	for (prec = 0; prec < q->num_prec; prec++) {
+		skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
+		while (skb) {
+			hslot = brcmf_skb_htod_tag_get_field(skb, HSLOT);
+			brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
+						true);
+			brcmu_pkt_buf_free_skb(skb);
+			skb = brcmu_pktq_pdeq_match(q, prec, matchfn, &ifidx);
+		}
+	}
+}
+
 static int brcmf_fws_hanger_mark_suppressed(struct brcmf_fws_hanger *h,
 					    u32 slot_id)
 {
@@ -2168,6 +2172,8 @@ void brcmf_fws_del_interface(struct brcm
 	brcmf_fws_lock(fws);
 	ifp->fws_desc = NULL;
 	brcmf_dbg(TRACE, "deleting %s\n", entry->name);
+	brcmf_fws_macdesc_cleanup(fws, &fws->desc.iface[ifp->ifidx],
+				  ifp->ifidx);
 	brcmf_fws_macdesc_deinit(entry);
 	brcmf_fws_cleanup(fws, ifp->ifidx);
 	brcmf_fws_unlock(fws);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c	2019-05-31 09:47:36.000000000 -0400
@@ -1112,7 +1112,7 @@ static void brcmf_msgbuf_process_event(s
 
 	skb->protocol = eth_type_trans(skb, ifp->ndev);
 
-	brcmf_fweh_process_skb(ifp->drvr, skb);
+	brcmf_fweh_process_skb(ifp->drvr, skb, 0);
 
 exit:
 	brcmu_pkt_buf_free_skb(skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c	2019-05-26 00:50:05.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c	2019-05-31 18:29:03.000000000 -0400
@@ -160,7 +160,7 @@ struct brcmf_usbdev_info {
 
 	struct usb_device *usbdev;
 	struct device *dev;
-	struct mutex dev_init_lock;
+	struct completion dev_init_done;
 
 	int ctl_in_pipe, ctl_out_pipe;
 	struct urb *ctl_urb; /* URB for control endpoint */
@@ -684,12 +684,18 @@ static int brcmf_usb_up(struct device *d
 
 static void brcmf_cancel_all_urbs(struct brcmf_usbdev_info *devinfo)
 {
+	int i;
+
 	if (devinfo->ctl_urb)
 		usb_kill_urb(devinfo->ctl_urb);
 	if (devinfo->bulk_urb)
 		usb_kill_urb(devinfo->bulk_urb);
-	brcmf_usb_free_q(&devinfo->tx_postq, true);
-	brcmf_usb_free_q(&devinfo->rx_postq, true);
+	if (devinfo->tx_reqs)
+		for (i = 0; i < devinfo->bus_pub.ntxq; i++)
+			usb_kill_urb(devinfo->tx_reqs[i].urb);
+	if (devinfo->rx_reqs)
+		for (i = 0; i < devinfo->bus_pub.nrxq; i++)
+			usb_kill_urb(devinfo->rx_reqs[i].urb);
 }
 
 static void brcmf_usb_down(struct device *dev)
@@ -1192,11 +1198,11 @@ static void brcmf_usb_probe_phase2(struc
 	if (ret)
 		goto error;
 
-	mutex_unlock(&devinfo->dev_init_lock);
+	complete(&devinfo->dev_init_done);
 	return;
 error:
 	brcmf_dbg(TRACE, "failed: dev=%s, err=%d\n", dev_name(dev), ret);
-	mutex_unlock(&devinfo->dev_init_lock);
+	complete(&devinfo->dev_init_done);
 	device_release_driver(dev);
 }
 
@@ -1242,7 +1248,7 @@ static int brcmf_usb_probe_cb(struct brc
 		if (ret)
 			goto fail;
 		/* we are done */
-		mutex_unlock(&devinfo->dev_init_lock);
+		complete(&devinfo->dev_init_done);
 		return 0;
 	}
 	bus->chip = bus_pub->devid;
@@ -1303,11 +1309,10 @@ brcmf_usb_probe(struct usb_interface *in
 
 	devinfo->usbdev = usb;
 	devinfo->dev = &usb->dev;
-	/* Take an init lock, to protect for disconnect while still loading.
+	/* Init completion, to protect for disconnect while still loading.
 	 * Necessary because of the asynchronous firmware load construction
 	 */
-	mutex_init(&devinfo->dev_init_lock);
-	mutex_lock(&devinfo->dev_init_lock);
+	init_completion(&devinfo->dev_init_done);
 
 	usb_set_intfdata(intf, devinfo);
 
@@ -1385,7 +1390,7 @@ brcmf_usb_probe(struct usb_interface *in
 	return 0;
 
 fail:
-	mutex_unlock(&devinfo->dev_init_lock);
+	complete(&devinfo->dev_init_done);
 	kfree(devinfo);
 	usb_set_intfdata(intf, NULL);
 	return ret;
@@ -1400,7 +1405,7 @@ brcmf_usb_disconnect(struct usb_interfac
 	devinfo = (struct brcmf_usbdev_info *)usb_get_intfdata(intf);
 
 	if (devinfo) {
-		mutex_lock(&devinfo->dev_init_lock);
+		wait_for_completion(&devinfo->dev_init_done);
 		/* Make sure that devinfo still exists. Firmware probe routines
 		 * may have released the device and cleared the intfdata.
 		 */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/broadcom/brcm80211/brcmfmac/vendor.c	2019-05-31 09:47:36.000000000 -0400
@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd
 	struct brcmf_if *ifp;
 	const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;
 	struct sk_buff *reply;
-	int ret, payload, ret_len;
+	unsigned int payload, ret_len;
 	void *dcmd_buf = NULL, *wr_pointer;
 	u16 msglen, maxmsglen = PAGE_SIZE - 0x100;
+	int ret;
 
 	if (len < sizeof(*cmdhdr)) {
 		brcmf_err("vendor command too short: %d\n", len);
@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd
 			brcmf_err("oversize return buffer %d\n", ret_len);
 			ret_len = BRCMF_DCMD_MAXLEN;
 		}
-		payload = max(ret_len, len) + 1;
+		payload = max_t(unsigned int, ret_len, len) + 1;
 		dcmd_buf = vzalloc(payload);
 		if (NULL == dcmd_buf)
 			return -ENOMEM;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/intel/iwlwifi/pcie/rx.c linux-libre-4.14.123-gnu/drivers/net/wireless/intel/iwlwifi/pcie/rx.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/intel/iwlwifi/pcie/rx.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/intel/iwlwifi/pcie/rx.c	2019-05-31 09:47:36.000000000 -0400
@@ -1252,10 +1252,15 @@ static void iwl_pcie_rx_handle_rb(struct
 static void iwl_pcie_rx_handle(struct iwl_trans *trans, int queue)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-	struct iwl_rxq *rxq = &trans_pcie->rxq[queue];
+	struct iwl_rxq *rxq;
 	u32 r, i, count = 0;
 	bool emergency = false;
 
+	if (WARN_ON_ONCE(!trans_pcie->rxq || !trans_pcie->rxq[queue].bd))
+		return;
+
+	rxq = &trans_pcie->rxq[queue];
+
 restart:
 	spin_lock(&rxq->lock);
 	/* uCode's read index (stored in shared DRAM) indicates the last Rx
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/marvell/mwifiex/cfg80211.c linux-libre-4.14.123-gnu/drivers/net/wireless/marvell/mwifiex/cfg80211.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/marvell/mwifiex/cfg80211.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/marvell/mwifiex/cfg80211.c	2019-05-31 09:47:36.000000000 -0400
@@ -4024,16 +4024,20 @@ static int mwifiex_tm_cmd(struct wiphy *
 
 		if (mwifiex_send_cmd(priv, 0, 0, 0, hostcmd, true)) {
 			dev_err(priv->adapter->dev, "Failed to process hostcmd\n");
+			kfree(hostcmd);
 			return -EFAULT;
 		}
 
 		/* process hostcmd response*/
 		skb = cfg80211_testmode_alloc_reply_skb(wiphy, hostcmd->len);
-		if (!skb)
+		if (!skb) {
+			kfree(hostcmd);
 			return -ENOMEM;
+		}
 		err = nla_put(skb, MWIFIEX_TM_ATTR_DATA,
 			      hostcmd->len, hostcmd->cmd);
 		if (err) {
+			kfree(hostcmd);
 			kfree_skb(skb);
 			return -EMSGSIZE;
 		}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/marvell/mwifiex/cfp.c linux-libre-4.14.123-gnu/drivers/net/wireless/marvell/mwifiex/cfp.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/marvell/mwifiex/cfp.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/marvell/mwifiex/cfp.c	2019-05-31 09:47:36.000000000 -0400
@@ -531,5 +531,8 @@ u8 mwifiex_adjust_data_rate(struct mwifi
 		rate_index = (rx_rate > MWIFIEX_RATE_INDEX_OFDM0) ?
 			      rx_rate - 1 : rx_rate;
 
+	if (rate_index >= MWIFIEX_MAX_AC_RX_RATES)
+		rate_index = MWIFIEX_MAX_AC_RX_RATES - 1;
+
 	return rate_index;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/base.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/base.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/base.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/base.c	2019-05-31 09:47:36.000000000 -0400
@@ -468,6 +468,11 @@ static void _rtl_init_deferred_work(stru
 	/* <2> work queue */
 	rtlpriv->works.hw = hw;
 	rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name);
+	if (unlikely(!rtlpriv->works.rtl_wq)) {
+		pr_err("Failed to allocate work queue\n");
+		return;
+	}
+
 	INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
 			  (void *)rtl_watchdog_wq_callback);
 	INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c	2019-05-31 09:47:36.000000000 -0400
@@ -620,6 +620,8 @@ void rtl88e_set_fw_rsvdpagepkt(struct ie
 		      u1rsvdpageloc, 3);
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c	2019-05-31 09:47:36.000000000 -0400
@@ -647,6 +647,8 @@ void rtl92c_set_fw_rsvdpagepkt(struct ie
 
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
 	if (cmd_send_packet)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c	2019-05-31 09:47:36.000000000 -0400
@@ -766,6 +766,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct i
 		      u1rsvdpageloc, 3);
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c	2019-05-31 09:47:36.000000000 -0400
@@ -470,6 +470,8 @@ void rtl8723e_set_fw_rsvdpagepkt(struct
 		      u1rsvdpageloc, 3);
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c	2019-05-31 09:47:36.000000000 -0400
@@ -584,6 +584,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct
 		      u1rsvdpageloc, sizeof(u1rsvdpageloc));
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c	2019-05-31 09:47:36.000000000 -0400
@@ -1645,6 +1645,8 @@ out:
 		      &reserved_page_packet_8812[0], totalpacketlen);
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet_8812, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
@@ -1781,6 +1783,8 @@ out:
 		      &reserved_page_packet_8821[0], totalpacketlen);
 
 	skb = dev_alloc_skb(totalpacketlen);
+	if (!skb)
+		return;
 	skb_put_data(skb, &reserved_page_packet_8821, totalpacketlen);
 
 	rtstatus = rtl_cmd_send_packet(hw, skb);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/net/wireless/st/cw1200/main.c linux-libre-4.14.123-gnu/drivers/net/wireless/st/cw1200/main.c
--- linux-libre-4.14.122-gnu/drivers/net/wireless/st/cw1200/main.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/net/wireless/st/cw1200/main.c	2019-05-31 09:47:36.000000000 -0400
@@ -345,6 +345,11 @@ static struct ieee80211_hw *cw1200_init_
 	mutex_init(&priv->wsm_cmd_mux);
 	mutex_init(&priv->conf_mutex);
 	priv->workqueue = create_singlethread_workqueue("cw1200_wq");
+	if (!priv->workqueue) {
+		ieee80211_free_hw(hw);
+		return NULL;
+	}
+
 	sema_init(&priv->scan.lock, 1);
 	INIT_WORK(&priv->scan.work, cw1200_scan_work);
 	INIT_DELAYED_WORK(&priv->scan.probe_work, cw1200_probe_work);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/nvdimm/label.c linux-libre-4.14.123-gnu/drivers/nvdimm/label.c
--- linux-libre-4.14.122-gnu/drivers/nvdimm/label.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/nvdimm/label.c	2019-05-31 09:47:36.000000000 -0400
@@ -614,6 +614,17 @@ static const guid_t *to_abstraction_guid
 		return &guid_null;
 }
 
+static void reap_victim(struct nd_mapping *nd_mapping,
+		struct nd_label_ent *victim)
+{
+	struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
+	u32 slot = to_slot(ndd, victim->label);
+
+	dev_dbg(ndd->dev, "free: %d\n", slot);
+	nd_label_free_slot(ndd, slot);
+	victim->label = NULL;
+}
+
 static int __pmem_label_update(struct nd_region *nd_region,
 		struct nd_mapping *nd_mapping, struct nd_namespace_pmem *nspm,
 		int pos, unsigned long flags)
@@ -621,9 +632,9 @@ static int __pmem_label_update(struct nd
 	struct nd_namespace_common *ndns = &nspm->nsio.common;
 	struct nd_interleave_set *nd_set = nd_region->nd_set;
 	struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
-	struct nd_label_ent *label_ent, *victim = NULL;
 	struct nd_namespace_label *nd_label;
 	struct nd_namespace_index *nsindex;
+	struct nd_label_ent *label_ent;
 	struct nd_label_id label_id;
 	struct resource *res;
 	unsigned long *free;
@@ -692,18 +703,10 @@ static int __pmem_label_update(struct nd
 	list_for_each_entry(label_ent, &nd_mapping->labels, list) {
 		if (!label_ent->label)
 			continue;
-		if (memcmp(nspm->uuid, label_ent->label->uuid,
-					NSLABEL_UUID_LEN) != 0)
-			continue;
-		victim = label_ent;
-		list_move_tail(&victim->list, &nd_mapping->labels);
-		break;
-	}
-	if (victim) {
-		dev_dbg(ndd->dev, "%s: free: %d\n", __func__, slot);
-		slot = to_slot(ndd, victim->label);
-		nd_label_free_slot(ndd, slot);
-		victim->label = NULL;
+		if (test_and_clear_bit(ND_LABEL_REAP, &label_ent->flags)
+				|| memcmp(nspm->uuid, label_ent->label->uuid,
+					NSLABEL_UUID_LEN) == 0)
+			reap_victim(nd_mapping, label_ent);
 	}
 
 	/* update index */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/nvdimm/namespace_devs.c linux-libre-4.14.123-gnu/drivers/nvdimm/namespace_devs.c
--- linux-libre-4.14.122-gnu/drivers/nvdimm/namespace_devs.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/nvdimm/namespace_devs.c	2019-05-31 09:47:36.000000000 -0400
@@ -1229,12 +1229,27 @@ static int namespace_update_uuid(struct
 	for (i = 0; i < nd_region->ndr_mappings; i++) {
 		struct nd_mapping *nd_mapping = &nd_region->mapping[i];
 		struct nvdimm_drvdata *ndd = to_ndd(nd_mapping);
+		struct nd_label_ent *label_ent;
 		struct resource *res;
 
 		for_each_dpa_resource(ndd, res)
 			if (strcmp(res->name, old_label_id.id) == 0)
 				sprintf((void *) res->name, "%s",
 						new_label_id.id);
+
+		mutex_lock(&nd_mapping->lock);
+		list_for_each_entry(label_ent, &nd_mapping->labels, list) {
+			struct nd_namespace_label *nd_label = label_ent->label;
+			struct nd_label_id label_id;
+
+			if (!nd_label)
+				continue;
+			nd_label_gen_id(&label_id, nd_label->uuid,
+					__le32_to_cpu(nd_label->flags));
+			if (strcmp(old_label_id.id, label_id.id) == 0)
+				set_bit(ND_LABEL_REAP, &label_ent->flags);
+		}
+		mutex_unlock(&nd_mapping->lock);
 	}
 	kfree(*old_uuid);
  out:
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/nvdimm/nd.h linux-libre-4.14.123-gnu/drivers/nvdimm/nd.h
--- linux-libre-4.14.122-gnu/drivers/nvdimm/nd.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/nvdimm/nd.h	2019-05-31 09:47:36.000000000 -0400
@@ -120,8 +120,12 @@ struct nd_percpu_lane {
 	spinlock_t lock;
 };
 
+enum nd_label_flags {
+	ND_LABEL_REAP,
+};
 struct nd_label_ent {
 	struct list_head list;
+	unsigned long flags;
 	struct nd_namespace_label *label;
 };
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/nvdimm/pmem.c linux-libre-4.14.123-gnu/drivers/nvdimm/pmem.c
--- linux-libre-4.14.122-gnu/drivers/nvdimm/pmem.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/nvdimm/pmem.c	2019-05-31 09:47:36.000000000 -0400
@@ -256,10 +256,16 @@ static long pmem_dax_direct_access(struc
 	return __pmem_direct_access(pmem, pgoff, nr_pages, kaddr, pfn);
 }
 
+/*
+ * Use the 'no check' versions of copy_from_iter_flushcache() and
+ * copy_to_iter_mcsafe() to bypass HARDENED_USERCOPY overhead. Bounds
+ * checking, both file offset and device offset, is handled by
+ * dax_iomap_actor()
+ */
 static size_t pmem_copy_from_iter(struct dax_device *dax_dev, pgoff_t pgoff,
 		void *addr, size_t bytes, struct iov_iter *i)
 {
-	return copy_from_iter_flushcache(addr, bytes, i);
+	return _copy_from_iter_flushcache(addr, bytes, i);
 }
 
 static const struct dax_operations pmem_dax_ops = {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/phy/allwinner/phy-sun4i-usb.c linux-libre-4.14.123-gnu/drivers/phy/allwinner/phy-sun4i-usb.c
--- linux-libre-4.14.122-gnu/drivers/phy/allwinner/phy-sun4i-usb.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/phy/allwinner/phy-sun4i-usb.c	2019-05-31 09:47:36.000000000 -0400
@@ -549,6 +549,7 @@ static void sun4i_usb_phy0_id_vbus_det_s
 	struct sun4i_usb_phy_data *data =
 		container_of(work, struct sun4i_usb_phy_data, detect.work);
 	struct phy *phy0 = data->phys[0].phy;
+	struct sun4i_usb_phy *phy = phy_get_drvdata(phy0);
 	bool force_session_end, id_notify = false, vbus_notify = false;
 	int id_det, vbus_det;
 
@@ -605,6 +606,9 @@ static void sun4i_usb_phy0_id_vbus_det_s
 			mutex_unlock(&phy0->mutex);
 		}
 
+		/* Enable PHY0 passby for host mode only. */
+		sun4i_usb_phy_passby(phy, !id_det);
+
 		/* Re-route PHY0 if necessary */
 		if (data->cfg->phy0_dual_route)
 			sun4i_usb_phy0_reroute(data, id_det);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/pinctrl/pinctrl-pistachio.c linux-libre-4.14.123-gnu/drivers/pinctrl/pinctrl-pistachio.c
--- linux-libre-4.14.122-gnu/drivers/pinctrl/pinctrl-pistachio.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/pinctrl/pinctrl-pistachio.c	2019-05-31 09:47:36.000000000 -0400
@@ -1368,6 +1368,7 @@ static int pistachio_gpio_register(struc
 		if (!of_find_property(child, "gpio-controller", NULL)) {
 			dev_err(pctl->dev,
 				"No gpio-controller property for bank %u\n", i);
+			of_node_put(child);
 			ret = -ENODEV;
 			goto err;
 		}
@@ -1375,6 +1376,7 @@ static int pistachio_gpio_register(struc
 		irq = irq_of_parse_and_map(child, 0);
 		if (irq < 0) {
 			dev_err(pctl->dev, "No IRQ for bank %u: %d\n", i, irq);
+			of_node_put(child);
 			ret = irq;
 			goto err;
 		}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/pinctrl/samsung/pinctrl-exynos-arm.c linux-libre-4.14.123-gnu/drivers/pinctrl/samsung/pinctrl-exynos-arm.c
--- linux-libre-4.14.122-gnu/drivers/pinctrl/samsung/pinctrl-exynos-arm.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/pinctrl/samsung/pinctrl-exynos-arm.c	2019-05-31 09:47:36.000000000 -0400
@@ -76,6 +76,7 @@ s5pv210_retention_init(struct samsung_pi
 	}
 
 	clk_base = of_iomap(np, 0);
+	of_node_put(np);
 	if (!clk_base) {
 		pr_err("%s: failed to map clock registers\n", __func__);
 		return ERR_PTR(-EINVAL);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/pinctrl/zte/pinctrl-zx.c linux-libre-4.14.123-gnu/drivers/pinctrl/zte/pinctrl-zx.c
--- linux-libre-4.14.122-gnu/drivers/pinctrl/zte/pinctrl-zx.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/pinctrl/zte/pinctrl-zx.c	2019-05-31 09:47:36.000000000 -0400
@@ -411,6 +411,7 @@ int zx_pinctrl_init(struct platform_devi
 	}
 
 	zpctl->aux_base = of_iomap(np, 0);
+	of_node_put(np);
 	if (!zpctl->aux_base)
 		return -ENOMEM;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/rtc/rtc-88pm860x.c linux-libre-4.14.123-gnu/drivers/rtc/rtc-88pm860x.c
--- linux-libre-4.14.122-gnu/drivers/rtc/rtc-88pm860x.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/rtc/rtc-88pm860x.c	2019-05-31 09:47:36.000000000 -0400
@@ -414,7 +414,7 @@ static int pm860x_rtc_remove(struct plat
 	struct pm860x_rtc_info *info = platform_get_drvdata(pdev);
 
 #ifdef VRTC_CALIBRATION
-	flush_scheduled_work();
+	cancel_delayed_work_sync(&info->calib_work);
 	/* disable measurement */
 	pm860x_set_bits(info->i2c, PM8607_MEAS_EN2, MEAS2_VRTC, 0);
 #endif	/* VRTC_CALIBRATION */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/rtc/rtc-xgene.c linux-libre-4.14.123-gnu/drivers/rtc/rtc-xgene.c
--- linux-libre-4.14.122-gnu/drivers/rtc/rtc-xgene.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/rtc/rtc-xgene.c	2019-05-31 09:47:36.000000000 -0400
@@ -163,6 +163,10 @@ static int xgene_rtc_probe(struct platfo
 	if (IS_ERR(pdata->csr_base))
 		return PTR_ERR(pdata->csr_base);
 
+	pdata->rtc = devm_rtc_allocate_device(&pdev->dev);
+	if (IS_ERR(pdata->rtc))
+		return PTR_ERR(pdata->rtc);
+
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
 		dev_err(&pdev->dev, "No IRQ resource\n");
@@ -187,15 +191,15 @@ static int xgene_rtc_probe(struct platfo
 
 	device_init_wakeup(&pdev->dev, 1);
 
-	pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-					 &xgene_rtc_ops, THIS_MODULE);
-	if (IS_ERR(pdata->rtc)) {
-		clk_disable_unprepare(pdata->clk);
-		return PTR_ERR(pdata->rtc);
-	}
-
 	/* HW does not support update faster than 1 seconds */
 	pdata->rtc->uie_unsupported = 1;
+	pdata->rtc->ops = &xgene_rtc_ops;
+
+	ret = rtc_register_device(pdata->rtc);
+	if (ret) {
+		clk_disable_unprepare(pdata->clk);
+		return ret;
+	}
 
 	return 0;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/s390/cio/cio.h linux-libre-4.14.123-gnu/drivers/s390/cio/cio.h
--- linux-libre-4.14.122-gnu/drivers/s390/cio/cio.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/s390/cio/cio.h	2019-05-31 09:47:36.000000000 -0400
@@ -115,7 +115,7 @@ struct subchannel {
 	struct schib_config config;
 } __attribute__ ((aligned(8)));
 
-DECLARE_PER_CPU(struct irb, cio_irb);
+DECLARE_PER_CPU_ALIGNED(struct irb, cio_irb);
 
 #define to_subchannel(n) container_of(n, struct subchannel, dev)
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/s390/cio/vfio_ccw_drv.c linux-libre-4.14.123-gnu/drivers/s390/cio/vfio_ccw_drv.c
--- linux-libre-4.14.122-gnu/drivers/s390/cio/vfio_ccw_drv.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/s390/cio/vfio_ccw_drv.c	2019-05-31 09:47:36.000000000 -0400
@@ -38,26 +38,30 @@ int vfio_ccw_sch_quiesce(struct subchann
 	if (ret != -EBUSY)
 		goto out_unlock;
 
+	iretry = 255;
 	do {
-		iretry = 255;
 
 		ret = cio_cancel_halt_clear(sch, &iretry);
-		while (ret == -EBUSY) {
-			/*
-			 * Flush all I/O and wait for
-			 * cancel/halt/clear completion.
-			 */
-			private->completion = &completion;
-			spin_unlock_irq(sch->lock);
 
-			wait_for_completion_timeout(&completion, 3*HZ);
+		if (ret == -EIO) {
+			pr_err("vfio_ccw: could not quiesce subchannel 0.%x.%04x!\n",
+			       sch->schid.ssid, sch->schid.sch_no);
+			break;
+		}
 
-			spin_lock_irq(sch->lock);
-			private->completion = NULL;
-			flush_workqueue(vfio_ccw_work_q);
-			ret = cio_cancel_halt_clear(sch, &iretry);
-		};
+		/*
+		 * Flush all I/O and wait for
+		 * cancel/halt/clear completion.
+		 */
+		private->completion = &completion;
+		spin_unlock_irq(sch->lock);
+
+		if (ret == -EBUSY)
+			wait_for_completion_timeout(&completion, 3*HZ);
 
+		private->completion = NULL;
+		flush_workqueue(vfio_ccw_work_q);
+		spin_lock_irq(sch->lock);
 		ret = cio_disable_subchannel(sch);
 	} while (ret == -EBUSY);
 out_unlock:
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/s390/cio/vfio_ccw_ops.c linux-libre-4.14.123-gnu/drivers/s390/cio/vfio_ccw_ops.c
--- linux-libre-4.14.122-gnu/drivers/s390/cio/vfio_ccw_ops.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/s390/cio/vfio_ccw_ops.c	2019-05-31 09:47:36.000000000 -0400
@@ -130,11 +130,12 @@ static int vfio_ccw_mdev_remove(struct m
 
 	if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
 	    (private->state != VFIO_CCW_STATE_STANDBY)) {
-		if (!vfio_ccw_mdev_reset(mdev))
+		if (!vfio_ccw_sch_quiesce(private->sch))
 			private->state = VFIO_CCW_STATE_STANDBY;
 		/* The state will be NOT_OPER on error. */
 	}
 
+	cp_free(&private->cp);
 	private->mdev = NULL;
 	atomic_inc(&private->avail);
 
@@ -158,6 +159,14 @@ static void vfio_ccw_mdev_release(struct
 	struct vfio_ccw_private *private =
 		dev_get_drvdata(mdev_parent_dev(mdev));
 
+	if ((private->state != VFIO_CCW_STATE_NOT_OPER) &&
+	    (private->state != VFIO_CCW_STATE_STANDBY)) {
+		if (!vfio_ccw_mdev_reset(mdev))
+			private->state = VFIO_CCW_STATE_STANDBY;
+		/* The state will be NOT_OPER on error. */
+	}
+
+	cp_free(&private->cp);
 	vfio_unregister_notifier(mdev_dev(mdev), VFIO_IOMMU_NOTIFY,
 				 &private->nb);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/s390/crypto/zcrypt_api.c linux-libre-4.14.123-gnu/drivers/s390/crypto/zcrypt_api.c
--- linux-libre-4.14.122-gnu/drivers/s390/crypto/zcrypt_api.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/s390/crypto/zcrypt_api.c	2019-05-31 09:47:36.000000000 -0400
@@ -237,6 +237,7 @@ static long zcrypt_rsa_modexpo(struct ic
 	trace_s390_zcrypt_req(mex, TP_ICARSAMODEXPO);
 
 	if (mex->outputdatalength < mex->inputdatalength) {
+		func_code = 0;
 		rc = -EINVAL;
 		goto out;
 	}
@@ -311,6 +312,7 @@ static long zcrypt_rsa_crt(struct ica_rs
 	trace_s390_zcrypt_req(crt, TP_ICARSACRT);
 
 	if (crt->outputdatalength < crt->inputdatalength) {
+		func_code = 0;
 		rc = -EINVAL;
 		goto out;
 	}
@@ -492,6 +494,7 @@ static long zcrypt_send_ep11_cprb(struct
 
 		targets = kcalloc(target_num, sizeof(*targets), GFP_KERNEL);
 		if (!targets) {
+			func_code = 0;
 			rc = -ENOMEM;
 			goto out;
 		}
@@ -499,6 +502,7 @@ static long zcrypt_send_ep11_cprb(struct
 		uptr = (struct ep11_target_dev __force __user *) xcrb->targets;
 		if (copy_from_user(targets, uptr,
 				   target_num * sizeof(*targets))) {
+			func_code = 0;
 			rc = -EFAULT;
 			goto out;
 		}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/libsas/sas_expander.c linux-libre-4.14.123-gnu/drivers/scsi/libsas/sas_expander.c
--- linux-libre-4.14.122-gnu/drivers/scsi/libsas/sas_expander.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/libsas/sas_expander.c	2019-05-31 09:47:36.000000000 -0400
@@ -2038,6 +2038,11 @@ static int sas_rediscover_dev(struct dom
 	if ((SAS_ADDR(sas_addr) == 0) || (res == -ECOMM)) {
 		phy->phy_state = PHY_EMPTY;
 		sas_unregister_devs_sas_addr(dev, phy_id, last);
+		/*
+		 * Even though the PHY is empty, for convenience we discover
+		 * the PHY to update the PHY info, like negotiated linkrate.
+		 */
+		sas_ex_phy_discover(dev, phy_id);
 		return res;
 	} else if (SAS_ADDR(sas_addr) == SAS_ADDR(phy->attached_sas_addr) &&
 		   dev_type_flutter(type, phy->attached_dev_type)) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/lpfc/lpfc_ct.c linux-libre-4.14.123-gnu/drivers/scsi/lpfc/lpfc_ct.c
--- linux-libre-4.14.122-gnu/drivers/scsi/lpfc/lpfc_ct.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/lpfc/lpfc_ct.c	2019-05-31 09:47:36.000000000 -0400
@@ -1734,6 +1734,9 @@ lpfc_fdmi_hba_attr_manufacturer(struct l
 	ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
 	memset(ae, 0, 256);
 
+	/* This string MUST be consistent with other FC platforms
+	 * supported by Broadcom.
+	 */
 	strncpy(ae->un.AttrString,
 		"Emulex Corporation",
 		       sizeof(ae->un.AttrString));
@@ -2089,10 +2092,11 @@ lpfc_fdmi_port_attr_fc4type(struct lpfc_
 	ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
 	memset(ae, 0, 32);
 
-	ae->un.AttrTypes[3] = 0x02; /* Type 1 - ELS */
-	ae->un.AttrTypes[2] = 0x01; /* Type 8 - FCP */
-	ae->un.AttrTypes[6] = 0x01; /* Type 40 - NVME */
-	ae->un.AttrTypes[7] = 0x01; /* Type 32 - CT */
+	ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */
+	ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */
+	if (vport->nvmei_support || vport->phba->nvmet_support)
+		ae->un.AttrTypes[6] = 0x01; /* Type 0x28 - NVME */
+	ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */
 	size = FOURBYTES + 32;
 	ad->AttrLen = cpu_to_be16(size);
 	ad->AttrType = cpu_to_be16(RPRT_SUPPORTED_FC4_TYPES);
@@ -2392,9 +2396,11 @@ lpfc_fdmi_port_attr_active_fc4type(struc
 	ae = (struct lpfc_fdmi_attr_entry *)&ad->AttrValue;
 	memset(ae, 0, 32);
 
-	ae->un.AttrTypes[3] = 0x02; /* Type 1 - ELS */
-	ae->un.AttrTypes[2] = 0x01; /* Type 8 - FCP */
-	ae->un.AttrTypes[7] = 0x01; /* Type 32 - CT */
+	ae->un.AttrTypes[3] = 0x02; /* Type 0x1 - ELS */
+	ae->un.AttrTypes[2] = 0x01; /* Type 0x8 - FCP */
+	if (vport->phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME)
+		ae->un.AttrTypes[6] = 0x1; /* Type 0x28 - NVME */
+	ae->un.AttrTypes[7] = 0x01; /* Type 0x20 - CT */
 	size = FOURBYTES + 32;
 	ad->AttrLen = cpu_to_be16(size);
 	ad->AttrType = cpu_to_be16(RPRT_ACTIVE_FC4_TYPES);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/lpfc/lpfc_hbadisc.c linux-libre-4.14.123-gnu/drivers/scsi/lpfc/lpfc_hbadisc.c
--- linux-libre-4.14.122-gnu/drivers/scsi/lpfc/lpfc_hbadisc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/lpfc/lpfc_hbadisc.c	2019-05-31 09:47:36.000000000 -0400
@@ -924,7 +924,11 @@ lpfc_linkdown(struct lpfc_hba *phba)
 		}
 	}
 	lpfc_destroy_vport_work_array(phba, vports);
-	/* Clean up any firmware default rpi's */
+
+	/* Clean up any SLI3 firmware default rpi's */
+	if (phba->sli_rev > LPFC_SLI_REV3)
+		goto skip_unreg_did;
+
 	mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
 	if (mb) {
 		lpfc_unreg_did(phba, 0xffff, LPFC_UNREG_ALL_DFLT_RPIS, mb);
@@ -936,6 +940,7 @@ lpfc_linkdown(struct lpfc_hba *phba)
 		}
 	}
 
+ skip_unreg_did:
 	/* Setup myDID for link up if we are in pt2pt mode */
 	if (phba->pport->fc_flag & FC_PT2PT) {
 		mb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
@@ -4853,6 +4858,10 @@ lpfc_unreg_default_rpis(struct lpfc_vpor
 	LPFC_MBOXQ_t     *mbox;
 	int rc;
 
+	/* Unreg DID is an SLI3 operation. */
+	if (phba->sli_rev > LPFC_SLI_REV3)
+		return;
+
 	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
 	if (mbox) {
 		lpfc_unreg_did(phba, vport->vpi, LPFC_UNREG_ALL_DFLT_RPIS,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/qedf/qedf_io.c linux-libre-4.14.123-gnu/drivers/scsi/qedf/qedf_io.c
--- linux-libre-4.14.122-gnu/drivers/scsi/qedf/qedf_io.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/qedf/qedf_io.c	2019-05-31 09:47:36.000000000 -0400
@@ -883,6 +883,7 @@ int qedf_post_io_req(struct qedf_rport *
 	if (!test_bit(QEDF_RPORT_SESSION_READY, &fcport->flags)) {
 		QEDF_ERR(&(qedf->dbg_ctx), "Session not offloaded yet.\n");
 		kref_put(&io_req->refcount, qedf_release_cmd);
+		return -EINVAL;
 	}
 
 	/* Obtain free SQE */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/qedi/qedi_iscsi.c linux-libre-4.14.123-gnu/drivers/scsi/qedi/qedi_iscsi.c
--- linux-libre-4.14.122-gnu/drivers/scsi/qedi/qedi_iscsi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/qedi/qedi_iscsi.c	2019-05-31 09:47:36.000000000 -0400
@@ -1008,6 +1008,9 @@ static void qedi_ep_disconnect(struct is
 	qedi_ep = ep->dd_data;
 	qedi = qedi_ep->qedi;
 
+	if (qedi_ep->state == EP_STATE_OFLDCONN_START)
+		goto ep_exit_recover;
+
 	flush_work(&qedi_ep->offload_work);
 
 	if (qedi_ep->conn) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/qla2xxx/qla_isr.c linux-libre-4.14.123-gnu/drivers/scsi/qla2xxx/qla_isr.c
--- linux-libre-4.14.122-gnu/drivers/scsi/qla2xxx/qla_isr.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/qla2xxx/qla_isr.c	2019-05-31 09:47:36.000000000 -0400
@@ -3395,7 +3395,7 @@ qla24xx_enable_msix(struct qla_hw_data *
 		ql_log(ql_log_fatal, vha, 0x00c8,
 		    "Failed to allocate memory for ha->msix_entries.\n");
 		ret = -ENOMEM;
-		goto msix_out;
+		goto free_irqs;
 	}
 	ha->flags.msix_enabled = 1;
 
@@ -3477,6 +3477,10 @@ msix_register_fail:
 
 msix_out:
 	return ret;
+
+free_irqs:
+	pci_free_irq_vectors(ha->pdev);
+	goto msix_out;
 }
 
 int
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/qla2xxx/tcm_qla2xxx.c linux-libre-4.14.123-gnu/drivers/scsi/qla2xxx/tcm_qla2xxx.c
--- linux-libre-4.14.122-gnu/drivers/scsi/qla2xxx/tcm_qla2xxx.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/qla2xxx/tcm_qla2xxx.c	2019-05-31 09:47:36.000000000 -0400
@@ -366,8 +366,9 @@ static void tcm_qla2xxx_close_session(st
 
 	spin_lock_irqsave(&vha->hw->tgt.sess_lock, flags);
 	target_sess_cmd_list_set_waiting(se_sess);
-	tcm_qla2xxx_put_sess(sess);
 	spin_unlock_irqrestore(&vha->hw->tgt.sess_lock, flags);
+
+	tcm_qla2xxx_put_sess(sess);
 }
 
 static u32 tcm_qla2xxx_sess_get_index(struct se_session *se_sess)
@@ -391,6 +392,8 @@ static int tcm_qla2xxx_write_pending(str
 			cmd->se_cmd.transport_state,
 			cmd->se_cmd.t_state,
 			cmd->se_cmd.se_cmd_flags);
+		transport_generic_request_failure(&cmd->se_cmd,
+			TCM_CHECK_CONDITION_ABORT_CMD);
 		return 0;
 	}
 	cmd->trc_flags |= TRC_XFR_RDY;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/qla4xxx/ql4_os.c linux-libre-4.14.123-gnu/drivers/scsi/qla4xxx/ql4_os.c
--- linux-libre-4.14.122-gnu/drivers/scsi/qla4xxx/ql4_os.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/qla4xxx/ql4_os.c	2019-05-31 09:47:36.000000000 -0400
@@ -5939,7 +5939,7 @@ static int get_fw_boot_info(struct scsi_
 		val = rd_nvram_byte(ha, sec_addr);
 		if (val & BIT_7)
 			ddb_index[1] = (val & 0x7f);
-
+		goto exit_boot_info;
 	} else if (is_qla80XX(ha)) {
 		buf = dma_alloc_coherent(&ha->pdev->dev, size,
 					 &buf_dma, GFP_KERNEL);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/sd.c linux-libre-4.14.123-gnu/drivers/scsi/sd.c
--- linux-libre-4.14.122-gnu/drivers/scsi/sd.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/sd.c	2019-05-31 09:47:36.000000000 -0400
@@ -2616,7 +2616,6 @@ sd_read_write_protect_flag(struct scsi_d
 	int res;
 	struct scsi_device *sdp = sdkp->device;
 	struct scsi_mode_data data;
-	int disk_ro = get_disk_ro(sdkp->disk);
 	int old_wp = sdkp->write_prot;
 
 	set_disk_ro(sdkp->disk, 0);
@@ -2657,7 +2656,7 @@ sd_read_write_protect_flag(struct scsi_d
 			  "Test WP failed, assume Write Enabled\n");
 	} else {
 		sdkp->write_prot = ((data.device_specific & 0x80) != 0);
-		set_disk_ro(sdkp->disk, sdkp->write_prot || disk_ro);
+		set_disk_ro(sdkp->disk, sdkp->write_prot);
 		if (sdkp->first_scan || old_wp != sdkp->write_prot) {
 			sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
 				  sdkp->write_prot ? "on" : "off");
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/scsi/ufs/ufshcd.c linux-libre-4.14.123-gnu/drivers/scsi/ufs/ufshcd.c
--- linux-libre-4.14.122-gnu/drivers/scsi/ufs/ufshcd.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/scsi/ufs/ufshcd.c	2019-05-31 09:47:36.000000000 -0400
@@ -5911,19 +5911,19 @@ static u32 ufshcd_find_max_sup_active_ic
 		goto out;
 	}
 
-	if (hba->vreg_info.vcc)
+	if (hba->vreg_info.vcc && hba->vreg_info.vcc->max_uA)
 		icc_level = ufshcd_get_max_icc_level(
 				hba->vreg_info.vcc->max_uA,
 				POWER_DESC_MAX_ACTV_ICC_LVLS - 1,
 				&desc_buf[PWR_DESC_ACTIVE_LVLS_VCC_0]);
 
-	if (hba->vreg_info.vccq)
+	if (hba->vreg_info.vccq && hba->vreg_info.vccq->max_uA)
 		icc_level = ufshcd_get_max_icc_level(
 				hba->vreg_info.vccq->max_uA,
 				icc_level,
 				&desc_buf[PWR_DESC_ACTIVE_LVLS_VCCQ_0]);
 
-	if (hba->vreg_info.vccq2)
+	if (hba->vreg_info.vccq2 && hba->vreg_info.vccq2->max_uA)
 		icc_level = ufshcd_get_max_icc_level(
 				hba->vreg_info.vccq2->max_uA,
 				icc_level,
@@ -6525,6 +6525,15 @@ static int ufshcd_config_vreg_load(struc
 	if (!vreg)
 		return 0;
 
+	/*
+	 * "set_load" operation shall be required on those regulators
+	 * which specifically configured current limitation. Otherwise
+	 * zero max_uA may cause unexpected behavior when regulator is
+	 * enabled or set as high power mode.
+	 */
+	if (!vreg->max_uA)
+		return 0;
+
 	ret = regulator_set_load(vreg->reg, ua);
 	if (ret < 0) {
 		dev_err(dev, "%s: %s set load (ua=%d) failed, err=%d\n",
@@ -6571,12 +6580,15 @@ static int ufshcd_config_vreg(struct dev
 	name = vreg->name;
 
 	if (regulator_count_voltages(reg) > 0) {
-		min_uV = on ? vreg->min_uV : 0;
-		ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);
-		if (ret) {
-			dev_err(dev, "%s: %s set voltage failed, err=%d\n",
+		if (vreg->min_uV && vreg->max_uV) {
+			min_uV = on ? vreg->min_uV : 0;
+			ret = regulator_set_voltage(reg, min_uV, vreg->max_uV);
+			if (ret) {
+				dev_err(dev,
+					"%s: %s set voltage failed, err=%d\n",
 					__func__, name, ret);
-			goto out;
+				goto out;
+			}
 		}
 
 		uA_load = on ? vreg->max_uA : 0;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/spi/spi.c linux-libre-4.14.123-gnu/drivers/spi/spi.c
--- linux-libre-4.14.122-gnu/drivers/spi/spi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/spi/spi.c	2019-05-31 09:47:36.000000000 -0400
@@ -991,6 +991,8 @@ static int spi_map_msg(struct spi_contro
 		if (max_tx || max_rx) {
 			list_for_each_entry(xfer, &msg->transfers,
 					    transfer_list) {
+				if (!xfer->len)
+					continue;
 				if (!xfer->tx_buf)
 					xfer->tx_buf = ctlr->dummy_tx;
 				if (!xfer->rx_buf)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/spi/spi-pxa2xx.c linux-libre-4.14.123-gnu/drivers/spi/spi-pxa2xx.c
--- linux-libre-4.14.122-gnu/drivers/spi/spi-pxa2xx.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/spi/spi-pxa2xx.c	2019-05-31 09:47:36.000000000 -0400
@@ -938,10 +938,14 @@ static unsigned int ssp_get_clk_div(stru
 
 	rate = min_t(int, ssp_clk, rate);
 
+	/*
+	 * Calculate the divisor for the SCR (Serial Clock Rate), avoiding
+	 * that the SSP transmission rate can be greater than the device rate
+	 */
 	if (ssp->type == PXA25x_SSP || ssp->type == CE4100_SSP)
-		return (ssp_clk / (2 * rate) - 1) & 0xff;
+		return (DIV_ROUND_UP(ssp_clk, 2 * rate) - 1) & 0xff;
 	else
-		return (ssp_clk / rate - 1) & 0xfff;
+		return (DIV_ROUND_UP(ssp_clk, rate) - 1)  & 0xfff;
 }
 
 static unsigned int pxa2xx_ssp_get_clk_div(struct driver_data *drv_data,
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/spi/spi-rspi.c linux-libre-4.14.123-gnu/drivers/spi/spi-rspi.c
--- linux-libre-4.14.122-gnu/drivers/spi/spi-rspi.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/spi/spi-rspi.c	2019-05-31 09:47:36.000000000 -0400
@@ -279,7 +279,8 @@ static int rspi_set_config_register(stru
 	/* Sets parity, interrupt mask */
 	rspi_write8(rspi, 0x00, RSPI_SPCR2);
 
-	/* Sets SPCMD */
+	/* Resets sequencer */
+	rspi_write8(rspi, 0, RSPI_SPSCR);
 	rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
 	rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
@@ -323,7 +324,8 @@ static int rspi_rz_set_config_register(s
 	rspi_write8(rspi, 0x00, RSPI_SSLND);
 	rspi_write8(rspi, 0x00, RSPI_SPND);
 
-	/* Sets SPCMD */
+	/* Resets sequencer */
+	rspi_write8(rspi, 0, RSPI_SPSCR);
 	rspi->spcmd |= SPCMD_SPB_8_TO_16(access_size);
 	rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
@@ -374,7 +376,8 @@ static int qspi_set_config_register(stru
 	/* Sets buffer to allow normal operation */
 	rspi_write8(rspi, 0x00, QSPI_SPBFCR);
 
-	/* Sets SPCMD */
+	/* Resets sequencer */
+	rspi_write8(rspi, 0, RSPI_SPSCR);
 	rspi_write16(rspi, rspi->spcmd, RSPI_SPCMD0);
 
 	/* Enables SPI function in master mode */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/spi/spi-tegra114.c linux-libre-4.14.123-gnu/drivers/spi/spi-tegra114.c
--- linux-libre-4.14.122-gnu/drivers/spi/spi-tegra114.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/spi/spi-tegra114.c	2019-05-31 09:47:36.000000000 -0400
@@ -1067,27 +1067,19 @@ static int tegra_spi_probe(struct platfo
 
 	spi_irq = platform_get_irq(pdev, 0);
 	tspi->irq = spi_irq;
-	ret = request_threaded_irq(tspi->irq, tegra_spi_isr,
-			tegra_spi_isr_thread, IRQF_ONESHOT,
-			dev_name(&pdev->dev), tspi);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
-					tspi->irq);
-		goto exit_free_master;
-	}
 
 	tspi->clk = devm_clk_get(&pdev->dev, "spi");
 	if (IS_ERR(tspi->clk)) {
 		dev_err(&pdev->dev, "can not get clock\n");
 		ret = PTR_ERR(tspi->clk);
-		goto exit_free_irq;
+		goto exit_free_master;
 	}
 
 	tspi->rst = devm_reset_control_get_exclusive(&pdev->dev, "spi");
 	if (IS_ERR(tspi->rst)) {
 		dev_err(&pdev->dev, "can not get reset\n");
 		ret = PTR_ERR(tspi->rst);
-		goto exit_free_irq;
+		goto exit_free_master;
 	}
 
 	tspi->max_buf_size = SPI_FIFO_DEPTH << 2;
@@ -1095,7 +1087,7 @@ static int tegra_spi_probe(struct platfo
 
 	ret = tegra_spi_init_dma_param(tspi, true);
 	if (ret < 0)
-		goto exit_free_irq;
+		goto exit_free_master;
 	ret = tegra_spi_init_dma_param(tspi, false);
 	if (ret < 0)
 		goto exit_rx_dma_free;
@@ -1117,18 +1109,32 @@ static int tegra_spi_probe(struct platfo
 		dev_err(&pdev->dev, "pm runtime get failed, e = %d\n", ret);
 		goto exit_pm_disable;
 	}
+
+	reset_control_assert(tspi->rst);
+	udelay(2);
+	reset_control_deassert(tspi->rst);
 	tspi->def_command1_reg  = SPI_M_S;
 	tegra_spi_writel(tspi, tspi->def_command1_reg, SPI_COMMAND1);
 	pm_runtime_put(&pdev->dev);
+	ret = request_threaded_irq(tspi->irq, tegra_spi_isr,
+				   tegra_spi_isr_thread, IRQF_ONESHOT,
+				   dev_name(&pdev->dev), tspi);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Failed to register ISR for IRQ %d\n",
+			tspi->irq);
+		goto exit_pm_disable;
+	}
 
 	master->dev.of_node = pdev->dev.of_node;
 	ret = devm_spi_register_master(&pdev->dev, master);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "can not register to master err %d\n", ret);
-		goto exit_pm_disable;
+		goto exit_free_irq;
 	}
 	return ret;
 
+exit_free_irq:
+	free_irq(spi_irq, tspi);
 exit_pm_disable:
 	pm_runtime_disable(&pdev->dev);
 	if (!pm_runtime_status_suspended(&pdev->dev))
@@ -1136,8 +1142,6 @@ exit_pm_disable:
 	tegra_spi_deinit_dma_param(tspi, false);
 exit_rx_dma_free:
 	tegra_spi_deinit_dma_param(tspi, true);
-exit_free_irq:
-	free_irq(spi_irq, tspi);
 exit_free_master:
 	spi_master_put(master);
 	return ret;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/spi/spi-topcliff-pch.c linux-libre-4.14.123-gnu/drivers/spi/spi-topcliff-pch.c
--- linux-libre-4.14.122-gnu/drivers/spi/spi-topcliff-pch.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/spi/spi-topcliff-pch.c	2019-05-31 09:47:36.000000000 -0400
@@ -1294,18 +1294,27 @@ static void pch_free_dma_buf(struct pch_
 				  dma->rx_buf_virt, dma->rx_buf_dma);
 }
 
-static void pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,
+static int pch_alloc_dma_buf(struct pch_spi_board_data *board_dat,
 			      struct pch_spi_data *data)
 {
 	struct pch_spi_dma_ctrl *dma;
+	int ret;
 
 	dma = &data->dma;
+	ret = 0;
 	/* Get Consistent memory for Tx DMA */
 	dma->tx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev,
 				PCH_BUF_SIZE, &dma->tx_buf_dma, GFP_KERNEL);
+	if (!dma->tx_buf_virt)
+		ret = -ENOMEM;
+
 	/* Get Consistent memory for Rx DMA */
 	dma->rx_buf_virt = dma_alloc_coherent(&board_dat->pdev->dev,
 				PCH_BUF_SIZE, &dma->rx_buf_dma, GFP_KERNEL);
+	if (!dma->rx_buf_virt)
+		ret = -ENOMEM;
+
+	return ret;
 }
 
 static int pch_spi_pd_probe(struct platform_device *plat_dev)
@@ -1382,7 +1391,9 @@ static int pch_spi_pd_probe(struct platf
 
 	if (use_dma) {
 		dev_info(&plat_dev->dev, "Use DMA for data transfers\n");
-		pch_alloc_dma_buf(board_dat, data);
+		ret = pch_alloc_dma_buf(board_dat, data);
+		if (ret)
+			goto err_spi_register_master;
 	}
 
 	ret = spi_register_master(master);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/ssb/bridge_pcmcia_80211.c linux-libre-4.14.123-gnu/drivers/ssb/bridge_pcmcia_80211.c
--- linux-libre-4.14.122-gnu/drivers/ssb/bridge_pcmcia_80211.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/ssb/bridge_pcmcia_80211.c	2019-05-31 09:47:36.000000000 -0400
@@ -113,16 +113,21 @@ static struct pcmcia_driver ssb_host_pcm
 	.resume		= ssb_host_pcmcia_resume,
 };
 
+static int pcmcia_init_failed;
+
 /*
  * These are not module init/exit functions!
  * The module_pcmcia_driver() helper cannot be used here.
  */
 int ssb_host_pcmcia_init(void)
 {
-	return pcmcia_register_driver(&ssb_host_pcmcia_driver);
+	pcmcia_init_failed = pcmcia_register_driver(&ssb_host_pcmcia_driver);
+
+	return pcmcia_init_failed;
 }
 
 void ssb_host_pcmcia_exit(void)
 {
-	pcmcia_unregister_driver(&ssb_host_pcmcia_driver);
+	if (!pcmcia_init_failed)
+		pcmcia_unregister_driver(&ssb_host_pcmcia_driver);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/thunderbolt/switch.c linux-libre-4.14.123-gnu/drivers/thunderbolt/switch.c
--- linux-libre-4.14.122-gnu/drivers/thunderbolt/switch.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/thunderbolt/switch.c	2019-05-31 09:47:36.000000000 -0400
@@ -1206,13 +1206,14 @@ int tb_switch_configure(struct tb_switch
 	return tb_plug_events_active(sw, true);
 }
 
-static void tb_switch_set_uuid(struct tb_switch *sw)
+static int tb_switch_set_uuid(struct tb_switch *sw)
 {
 	u32 uuid[4];
-	int cap;
+	int cap, ret;
 
+	ret = 0;
 	if (sw->uuid)
-		return;
+		return ret;
 
 	/*
 	 * The newer controllers include fused UUID as part of link
@@ -1220,7 +1221,9 @@ static void tb_switch_set_uuid(struct tb
 	 */
 	cap = tb_switch_find_vse_cap(sw, TB_VSE_CAP_LINK_CONTROLLER);
 	if (cap > 0) {
-		tb_sw_read(sw, uuid, TB_CFG_SWITCH, cap + 3, 4);
+		ret = tb_sw_read(sw, uuid, TB_CFG_SWITCH, cap + 3, 4);
+		if (ret)
+			return ret;
 	} else {
 		/*
 		 * ICM generates UUID based on UID and fills the upper
@@ -1235,6 +1238,9 @@ static void tb_switch_set_uuid(struct tb
 	}
 
 	sw->uuid = kmemdup(uuid, sizeof(uuid), GFP_KERNEL);
+	if (!sw->uuid)
+		ret = -ENOMEM;
+	return ret;
 }
 
 static int tb_switch_add_dma_port(struct tb_switch *sw)
@@ -1280,7 +1286,9 @@ static int tb_switch_add_dma_port(struct
 
 	if (status) {
 		tb_sw_info(sw, "switch flash authentication failed\n");
-		tb_switch_set_uuid(sw);
+		ret = tb_switch_set_uuid(sw);
+		if (ret)
+			return ret;
 		nvm_set_auth_status(sw, status);
 	}
 
@@ -1330,7 +1338,9 @@ int tb_switch_add(struct tb_switch *sw)
 		}
 		tb_sw_info(sw, "uid: %#llx\n", sw->uid);
 
-		tb_switch_set_uuid(sw);
+		ret = tb_switch_set_uuid(sw);
+		if (ret)
+			return ret;
 
 		for (i = 0; i <= sw->config.max_port_number; i++) {
 			if (sw->ports[i].disabled) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/tty/ipwireless/main.c linux-libre-4.14.123-gnu/drivers/tty/ipwireless/main.c
--- linux-libre-4.14.122-gnu/drivers/tty/ipwireless/main.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/tty/ipwireless/main.c	2019-05-31 09:47:36.000000000 -0400
@@ -113,6 +113,10 @@ static int ipwireless_probe(struct pcmci
 
 	ipw->common_memory = ioremap(p_dev->resource[2]->start,
 				resource_size(p_dev->resource[2]));
+	if (!ipw->common_memory) {
+		ret = -ENOMEM;
+		goto exit1;
+	}
 	if (!request_mem_region(p_dev->resource[2]->start,
 				resource_size(p_dev->resource[2]),
 				IPWIRELESS_PCCARD_NAME)) {
@@ -133,6 +137,10 @@ static int ipwireless_probe(struct pcmci
 
 	ipw->attr_memory = ioremap(p_dev->resource[3]->start,
 				resource_size(p_dev->resource[3]));
+	if (!ipw->attr_memory) {
+		ret = -ENOMEM;
+		goto exit3;
+	}
 	if (!request_mem_region(p_dev->resource[3]->start,
 				resource_size(p_dev->resource[3]),
 				IPWIRELESS_PCCARD_NAME)) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/usb/core/hcd.c linux-libre-4.14.123-gnu/drivers/usb/core/hcd.c
--- linux-libre-4.14.122-gnu/drivers/usb/core/hcd.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/usb/core/hcd.c	2019-05-31 09:47:36.000000000 -0400
@@ -3053,6 +3053,9 @@ usb_hcd_platform_shutdown(struct platfor
 {
 	struct usb_hcd *hcd = platform_get_drvdata(dev);
 
+	/* No need for pm_runtime_put(), we're shutting down */
+	pm_runtime_get_sync(&dev->dev);
+
 	if (hcd->driver->shutdown)
 		hcd->driver->shutdown(hcd);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/usb/core/hub.c linux-libre-4.14.123-gnu/drivers/usb/core/hub.c
--- linux-libre-4.14.122-gnu/drivers/usb/core/hub.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/usb/core/hub.c	2019-05-31 09:47:36.000000000 -0400
@@ -5713,7 +5713,10 @@ int usb_reset_device(struct usb_device *
 					cintf->needs_binding = 1;
 			}
 		}
-		usb_unbind_and_rebind_marked_interfaces(udev);
+
+		/* If the reset failed, hub_wq will unbind drivers later */
+		if (ret == 0)
+			usb_unbind_and_rebind_marked_interfaces(udev);
 	}
 
 	usb_autosuspend_device(udev);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/video/fbdev/core/fbcmap.c linux-libre-4.14.123-gnu/drivers/video/fbdev/core/fbcmap.c
--- linux-libre-4.14.122-gnu/drivers/video/fbdev/core/fbcmap.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/video/fbdev/core/fbcmap.c	2019-05-31 09:47:36.000000000 -0400
@@ -94,6 +94,8 @@ int fb_alloc_cmap_gfp(struct fb_cmap *cm
 	int size = len * sizeof(u16);
 	int ret = -ENOMEM;
 
+	flags |= __GFP_NOWARN;
+
 	if (cmap->len != len) {
 		fb_dealloc_cmap(cmap);
 		if (!len)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/video/fbdev/core/modedb.c linux-libre-4.14.123-gnu/drivers/video/fbdev/core/modedb.c
--- linux-libre-4.14.122-gnu/drivers/video/fbdev/core/modedb.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/video/fbdev/core/modedb.c	2019-05-31 09:47:36.000000000 -0400
@@ -933,6 +933,9 @@ void fb_var_to_videomode(struct fb_video
 	if (var->vmode & FB_VMODE_DOUBLE)
 		vtotal *= 2;
 
+	if (!htotal || !vtotal)
+		return;
+
 	hfreq = pixclock/htotal;
 	mode->refresh = hfreq/vtotal;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/drivers/w1/w1_io.c linux-libre-4.14.123-gnu/drivers/w1/w1_io.c
--- linux-libre-4.14.122-gnu/drivers/w1/w1_io.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/drivers/w1/w1_io.c	2019-05-31 09:47:36.000000000 -0400
@@ -430,8 +430,7 @@ int w1_reset_resume_command(struct w1_ma
 	if (w1_reset_bus(dev))
 		return -1;
 
-	/* This will make only the last matched slave perform a skip ROM. */
-	w1_write_8(dev, W1_RESUME_CMD);
+	w1_write_8(dev, dev->slave_count > 1 ? W1_RESUME_CMD : W1_SKIP_ROM);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(w1_reset_resume_command);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/backref.c linux-libre-4.14.123-gnu/fs/btrfs/backref.c
--- linux-libre-4.14.122-gnu/fs/btrfs/backref.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/backref.c	2019-05-31 09:47:36.000000000 -0400
@@ -718,7 +718,7 @@ out:
  * read tree blocks and add keys where required.
  */
 static int add_missing_keys(struct btrfs_fs_info *fs_info,
-			    struct preftrees *preftrees)
+			    struct preftrees *preftrees, bool lock)
 {
 	struct prelim_ref *ref;
 	struct extent_buffer *eb;
@@ -742,12 +742,14 @@ static int add_missing_keys(struct btrfs
 			free_extent_buffer(eb);
 			return -EIO;
 		}
-		btrfs_tree_read_lock(eb);
+		if (lock)
+			btrfs_tree_read_lock(eb);
 		if (btrfs_header_level(eb) == 0)
 			btrfs_item_key_to_cpu(eb, &ref->key_for_search, 0);
 		else
 			btrfs_node_key_to_cpu(eb, &ref->key_for_search, 0);
-		btrfs_tree_read_unlock(eb);
+		if (lock)
+			btrfs_tree_read_unlock(eb);
 		free_extent_buffer(eb);
 		prelim_ref_insert(fs_info, &preftrees->indirect, ref, NULL);
 		cond_resched();
@@ -1228,7 +1230,7 @@ again:
 
 	btrfs_release_path(path);
 
-	ret = add_missing_keys(fs_info, &preftrees);
+	ret = add_missing_keys(fs_info, &preftrees, path->skip_locking == 0);
 	if (ret)
 		goto out;
 
@@ -1290,9 +1292,14 @@ again:
 				}
 				btrfs_tree_read_lock(eb);
 				btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+				if (!path->skip_locking) {
+					btrfs_tree_read_lock(eb);
+					btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);
+				}
 				ret = find_extent_in_eb(eb, bytenr,
 							*extent_item_pos, &eie);
-				btrfs_tree_read_unlock_blocking(eb);
+				if (!path->skip_locking)
+					btrfs_tree_read_unlock_blocking(eb);
 				free_extent_buffer(eb);
 				if (ret < 0)
 					goto out;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/extent-tree.c linux-libre-4.14.123-gnu/fs/btrfs/extent-tree.c
--- linux-libre-4.14.122-gnu/fs/btrfs/extent-tree.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/extent-tree.c	2019-05-31 09:47:36.000000000 -0400
@@ -4087,8 +4087,7 @@ static int create_space_info(struct btrf
 				    info->space_info_kobj, "%s",
 				    alloc_name(space_info->flags));
 	if (ret) {
-		percpu_counter_destroy(&space_info->total_bytes_pinned);
-		kfree(space_info);
+		kobject_put(&space_info->kobj);
 		return ret;
 	}
 
@@ -11058,9 +11057,9 @@ int btrfs_error_unpin_extent_range(struc
  * transaction.
  */
 static int btrfs_trim_free_extents(struct btrfs_device *device,
-				   struct fstrim_range *range, u64 *trimmed)
+				   u64 minlen, u64 *trimmed)
 {
-	u64 start = range->start, len = 0;
+	u64 start = 0, len = 0;
 	int ret;
 
 	*trimmed = 0;
@@ -11096,8 +11095,8 @@ static int btrfs_trim_free_extents(struc
 			refcount_inc(&trans->use_count);
 		spin_unlock(&fs_info->trans_lock);
 
-		ret = find_free_dev_extent_start(trans, device, range->minlen,
-						 start, &start, &len);
+		ret = find_free_dev_extent_start(trans, device, minlen, start,
+						 &start, &len);
 		if (trans)
 			btrfs_put_transaction(trans);
 
@@ -11109,16 +11108,6 @@ static int btrfs_trim_free_extents(struc
 			break;
 		}
 
-		/* If we are out of the passed range break */
-		if (start > range->start + range->len - 1) {
-			mutex_unlock(&fs_info->chunk_mutex);
-			ret = 0;
-			break;
-		}
-
-		start = max(range->start, start);
-		len = min(range->len, len);
-
 		ret = btrfs_issue_discard(device->bdev, start, len, &bytes);
 		up_read(&fs_info->commit_root_sem);
 		mutex_unlock(&fs_info->chunk_mutex);
@@ -11129,10 +11118,6 @@ static int btrfs_trim_free_extents(struc
 		start += len;
 		*trimmed += bytes;
 
-		/* We've trimmed enough */
-		if (*trimmed >= range->len)
-			break;
-
 		if (fatal_signal_pending(current)) {
 			ret = -ERESTARTSYS;
 			break;
@@ -11216,7 +11201,8 @@ int btrfs_trim_fs(struct btrfs_fs_info *
 	mutex_lock(&fs_info->fs_devices->device_list_mutex);
 	devices = &fs_info->fs_devices->devices;
 	list_for_each_entry(device, devices, dev_list) {
-		ret = btrfs_trim_free_extents(device, range, &group_trimmed);
+		ret = btrfs_trim_free_extents(device, range->minlen,
+					      &group_trimmed);
 		if (ret) {
 			dev_failed++;
 			dev_ret = ret;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/file.c linux-libre-4.14.123-gnu/fs/btrfs/file.c
--- linux-libre-4.14.122-gnu/fs/btrfs/file.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/file.c	2019-05-31 09:47:36.000000000 -0400
@@ -2059,6 +2059,18 @@ int btrfs_sync_file(struct file *file, l
 	u64 len;
 
 	/*
+	 * If the inode needs a full sync, make sure we use a full range to
+	 * avoid log tree corruption, due to hole detection racing with ordered
+	 * extent completion for adjacent ranges, and assertion failures during
+	 * hole detection.
+	 */
+	if (test_bit(BTRFS_INODE_NEEDS_FULL_SYNC,
+		     &BTRFS_I(inode)->runtime_flags)) {
+		start = 0;
+		end = LLONG_MAX;
+	}
+
+	/*
 	 * The range length can be represented by u64, we have to do the typecasts
 	 * to avoid signed overflow if it's [0, LLONG_MAX] eg. from fsync()
 	 */
@@ -2964,6 +2976,7 @@ static long btrfs_fallocate(struct file
 			ret = btrfs_qgroup_reserve_data(inode, &data_reserved,
 					cur_offset, last_byte - cur_offset);
 			if (ret < 0) {
+				cur_offset = last_byte;
 				free_extent_map(em);
 				break;
 			}
@@ -3034,7 +3047,7 @@ out:
 	/* Let go of our reservation. */
 	if (ret != 0)
 		btrfs_free_reserved_data_space(inode, data_reserved,
-				alloc_start, alloc_end - cur_offset);
+				cur_offset, alloc_end - cur_offset);
 	extent_changeset_free(data_reserved);
 	return ret;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/relocation.c linux-libre-4.14.123-gnu/fs/btrfs/relocation.c
--- linux-libre-4.14.122-gnu/fs/btrfs/relocation.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/relocation.c	2019-05-31 09:47:36.000000000 -0400
@@ -4403,27 +4403,36 @@ int btrfs_relocate_block_group(struct bt
 		mutex_lock(&fs_info->cleaner_mutex);
 		ret = relocate_block_group(rc);
 		mutex_unlock(&fs_info->cleaner_mutex);
-		if (ret < 0) {
+		if (ret < 0)
 			err = ret;
-			goto out;
-		}
-
-		if (rc->extents_found == 0)
-			break;
-
-		btrfs_info(fs_info, "found %llu extents", rc->extents_found);
 
+		/*
+		 * We may have gotten ENOSPC after we already dirtied some
+		 * extents.  If writeout happens while we're relocating a
+		 * different block group we could end up hitting the
+		 * BUG_ON(rc->stage == UPDATE_DATA_PTRS) in
+		 * btrfs_reloc_cow_block.  Make sure we write everything out
+		 * properly so we don't trip over this problem, and then break
+		 * out of the loop if we hit an error.
+		 */
 		if (rc->stage == MOVE_DATA_EXTENTS && rc->found_file_extent) {
 			ret = btrfs_wait_ordered_range(rc->data_inode, 0,
 						       (u64)-1);
-			if (ret) {
+			if (ret)
 				err = ret;
-				goto out;
-			}
 			invalidate_mapping_pages(rc->data_inode->i_mapping,
 						 0, -1);
 			rc->stage = UPDATE_DATA_PTRS;
 		}
+
+		if (err < 0)
+			goto out;
+
+		if (rc->extents_found == 0)
+			break;
+
+		btrfs_info(fs_info, "found %llu extents", rc->extents_found);
+
 	}
 
 	WARN_ON(rc->block_group->pinned > 0);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/root-tree.c linux-libre-4.14.123-gnu/fs/btrfs/root-tree.c
--- linux-libre-4.14.122-gnu/fs/btrfs/root-tree.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/root-tree.c	2019-05-31 09:47:36.000000000 -0400
@@ -145,16 +145,17 @@ int btrfs_update_root(struct btrfs_trans
 		return -ENOMEM;
 
 	ret = btrfs_search_slot(trans, root, key, path, 0, 1);
-	if (ret < 0) {
-		btrfs_abort_transaction(trans, ret);
+	if (ret < 0)
 		goto out;
-	}
 
-	if (ret != 0) {
-		btrfs_print_leaf(path->nodes[0]);
-		btrfs_crit(fs_info, "unable to update root key %llu %u %llu",
-			   key->objectid, key->type, key->offset);
-		BUG_ON(1);
+	if (ret > 0) {
+		btrfs_crit(fs_info,
+			"unable to find root key (%llu %u %llu) in tree %llu",
+			key->objectid, key->type, key->offset,
+			root->root_key.objectid);
+		ret = -EUCLEAN;
+		btrfs_abort_transaction(trans, ret);
+		goto out;
 	}
 
 	l = path->nodes[0];
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/sysfs.c linux-libre-4.14.123-gnu/fs/btrfs/sysfs.c
--- linux-libre-4.14.122-gnu/fs/btrfs/sysfs.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/sysfs.c	2019-05-31 09:47:36.000000000 -0400
@@ -794,7 +794,12 @@ int btrfs_sysfs_add_fsid(struct btrfs_fs
 	fs_devs->fsid_kobj.kset = btrfs_kset;
 	error = kobject_init_and_add(&fs_devs->fsid_kobj,
 				&btrfs_ktype, parent, "%pU", fs_devs->fsid);
-	return error;
+	if (error) {
+		kobject_put(&fs_devs->fsid_kobj);
+		return error;
+	}
+
+	return 0;
 }
 
 int btrfs_sysfs_add_mounted(struct btrfs_fs_info *fs_info)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/btrfs/tree-log.c linux-libre-4.14.123-gnu/fs/btrfs/tree-log.c
--- linux-libre-4.14.122-gnu/fs/btrfs/tree-log.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/btrfs/tree-log.c	2019-05-31 09:47:36.000000000 -0400
@@ -4012,6 +4012,7 @@ fill_holes:
 							       *last_extent, 0,
 							       0, len, 0, len,
 							       0, 0, 0);
+				*last_extent += len;
 			}
 		}
 	}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/char_dev.c linux-libre-4.14.123-gnu/fs/char_dev.c
--- linux-libre-4.14.122-gnu/fs/char_dev.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/char_dev.c	2019-05-31 09:47:36.000000000 -0400
@@ -159,6 +159,12 @@ __register_chrdev_region(unsigned int ma
 			ret = -EBUSY;
 			goto out;
 		}
+
+		if (new_min < old_min && new_max > old_max) {
+			ret = -EBUSY;
+			goto out;
+		}
+
 	}
 
 	cd->next = *cp;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/ext4/inode.c linux-libre-4.14.123-gnu/fs/ext4/inode.c
--- linux-libre-4.14.122-gnu/fs/ext4/inode.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/ext4/inode.c	2019-05-31 09:47:36.000000000 -0400
@@ -5450,7 +5450,7 @@ int ext4_setattr(struct dentry *dentry,
 			up_write(&EXT4_I(inode)->i_data_sem);
 			ext4_journal_stop(handle);
 			if (error) {
-				if (orphan)
+				if (orphan && inode->i_nlink)
 					ext4_orphan_del(NULL, inode);
 				goto err_out;
 			}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/f2fs/data.c linux-libre-4.14.123-gnu/fs/f2fs/data.c
--- linux-libre-4.14.122-gnu/fs/f2fs/data.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/f2fs/data.c	2019-05-31 09:47:36.000000000 -0400
@@ -133,12 +133,14 @@ struct block_device *f2fs_target_device(
 	struct block_device *bdev = sbi->sb->s_bdev;
 	int i;
 
-	for (i = 0; i < sbi->s_ndevs; i++) {
-		if (FDEV(i).start_blk <= blk_addr &&
-					FDEV(i).end_blk >= blk_addr) {
-			blk_addr -= FDEV(i).start_blk;
-			bdev = FDEV(i).bdev;
-			break;
+	if (f2fs_is_multi_device(sbi)) {
+		for (i = 0; i < sbi->s_ndevs; i++) {
+			if (FDEV(i).start_blk <= blk_addr &&
+			    FDEV(i).end_blk >= blk_addr) {
+				blk_addr -= FDEV(i).start_blk;
+				bdev = FDEV(i).bdev;
+				break;
+			}
 		}
 	}
 	if (bio) {
@@ -152,6 +154,9 @@ int f2fs_target_device_index(struct f2fs
 {
 	int i;
 
+	if (!f2fs_is_multi_device(sbi))
+		return 0;
+
 	for (i = 0; i < sbi->s_ndevs; i++)
 		if (FDEV(i).start_blk <= blkaddr && FDEV(i).end_blk >= blkaddr)
 			return i;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/f2fs/f2fs.h linux-libre-4.14.123-gnu/fs/f2fs/f2fs.h
--- linux-libre-4.14.122-gnu/fs/f2fs/f2fs.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/f2fs/f2fs.h	2019-05-31 09:47:36.000000000 -0400
@@ -1167,6 +1167,17 @@ static inline bool time_to_inject(struct
 }
 #endif
 
+/*
+ * Test if the mounted volume is a multi-device volume.
+ *   - For a single regular disk volume, sbi->s_ndevs is 0.
+ *   - For a single zoned disk volume, sbi->s_ndevs is 1.
+ *   - For a multi-device volume, sbi->s_ndevs is always 2 or more.
+ */
+static inline bool f2fs_is_multi_device(struct f2fs_sb_info *sbi)
+{
+	return sbi->s_ndevs > 1;
+}
+
 /* For write statistics. Suppose sector size is 512 bytes,
  * and the return value is in kbytes. s is of struct f2fs_sb_info.
  */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/f2fs/file.c linux-libre-4.14.123-gnu/fs/f2fs/file.c
--- linux-libre-4.14.122-gnu/fs/f2fs/file.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/f2fs/file.c	2019-05-31 09:47:36.000000000 -0400
@@ -2407,7 +2407,7 @@ static int f2fs_ioc_flush_device(struct
 							sizeof(range)))
 		return -EFAULT;
 
-	if (sbi->s_ndevs <= 1 || sbi->s_ndevs - 1 <= range.dev_num ||
+	if (!f2fs_is_multi_device(sbi) || sbi->s_ndevs - 1 <= range.dev_num ||
 			sbi->segs_per_sec != 1) {
 		f2fs_msg(sbi->sb, KERN_WARNING,
 			"Can't flush %u in %d for segs_per_sec %u != 1\n",
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/f2fs/gc.c linux-libre-4.14.123-gnu/fs/f2fs/gc.c
--- linux-libre-4.14.122-gnu/fs/f2fs/gc.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/f2fs/gc.c	2019-05-31 09:47:36.000000000 -0400
@@ -1111,7 +1111,7 @@ void build_gc_manager(struct f2fs_sb_inf
 				BLKS_PER_SEC(sbi), (main_count - resv_count));
 
 	/* give warm/cold data area from slower device */
-	if (sbi->s_ndevs && sbi->segs_per_sec == 1)
+	if (f2fs_is_multi_device(sbi) && sbi->segs_per_sec == 1)
 		SIT_I(sbi)->last_victim[ALLOC_NEXT] =
 				GET_SEGNO(sbi, FDEV(0).end_blk) + 1;
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/f2fs/segment.c linux-libre-4.14.123-gnu/fs/f2fs/segment.c
--- linux-libre-4.14.122-gnu/fs/f2fs/segment.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/f2fs/segment.c	2019-05-31 09:47:36.000000000 -0400
@@ -495,7 +495,7 @@ static int submit_flush_wait(struct f2fs
 	int ret = __submit_flush_wait(sbi, sbi->sb->s_bdev);
 	int i;
 
-	if (!sbi->s_ndevs || ret)
+	if (!f2fs_is_multi_device(sbi) || ret)
 		return ret;
 
 	for (i = 1; i < sbi->s_ndevs; i++) {
@@ -1050,7 +1050,7 @@ static int __queue_discard_cmd(struct f2
 
 	trace_f2fs_queue_discard(bdev, blkstart, blklen);
 
-	if (sbi->s_ndevs) {
+	if (f2fs_is_multi_device(sbi)) {
 		int devi = f2fs_target_device_index(sbi, blkstart);
 
 		blkstart -= FDEV(devi).start_blk;
@@ -1283,7 +1283,7 @@ static int __f2fs_issue_discard_zone(str
 	block_t lblkstart = blkstart;
 	int devi = 0;
 
-	if (sbi->s_ndevs) {
+	if (f2fs_is_multi_device(sbi)) {
 		devi = f2fs_target_device_index(sbi, blkstart);
 		blkstart -= FDEV(devi).start_blk;
 	}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/gfs2/glock.c linux-libre-4.14.123-gnu/fs/gfs2/glock.c
--- linux-libre-4.14.122-gnu/fs/gfs2/glock.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/gfs2/glock.c	2019-05-31 09:47:36.000000000 -0400
@@ -140,6 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *
 {
 	struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
 
+	BUG_ON(atomic_read(&gl->gl_revokes));
 	rhashtable_remove_fast(&gl_hash_table, &gl->gl_node, ht_parms);
 	smp_mb();
 	wake_up_glock(gl);
@@ -183,15 +184,19 @@ static int demote_ok(const struct gfs2_g
 
 void gfs2_glock_add_to_lru(struct gfs2_glock *gl)
 {
+	if (!(gl->gl_ops->go_flags & GLOF_LRU))
+		return;
+
 	spin_lock(&lru_lock);
 
-	if (!list_empty(&gl->gl_lru))
-		list_del_init(&gl->gl_lru);
-	else
+	list_del(&gl->gl_lru);
+	list_add_tail(&gl->gl_lru, &lru_list);
+
+	if (!test_bit(GLF_LRU, &gl->gl_flags)) {
+		set_bit(GLF_LRU, &gl->gl_flags);
 		atomic_inc(&lru_count);
+	}
 
-	list_add_tail(&gl->gl_lru, &lru_list);
-	set_bit(GLF_LRU, &gl->gl_flags);
 	spin_unlock(&lru_lock);
 }
 
@@ -201,7 +206,7 @@ static void gfs2_glock_remove_from_lru(s
 		return;
 
 	spin_lock(&lru_lock);
-	if (!list_empty(&gl->gl_lru)) {
+	if (test_bit(GLF_LRU, &gl->gl_flags)) {
 		list_del_init(&gl->gl_lru);
 		atomic_dec(&lru_count);
 		clear_bit(GLF_LRU, &gl->gl_flags);
@@ -1158,8 +1163,7 @@ void gfs2_glock_dq(struct gfs2_holder *g
 		    !test_bit(GLF_DEMOTE, &gl->gl_flags))
 			fast_path = 1;
 	}
-	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl) &&
-	    (glops->go_flags & GLOF_LRU))
+	if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl))
 		gfs2_glock_add_to_lru(gl);
 
 	trace_gfs2_glock_queue(gh, 0);
@@ -1454,6 +1458,7 @@ __acquires(&lru_lock)
 		if (!spin_trylock(&gl->gl_lockref.lock)) {
 add_back_to_lru:
 			list_add(&gl->gl_lru, &lru_list);
+			set_bit(GLF_LRU, &gl->gl_flags);
 			atomic_inc(&lru_count);
 			continue;
 		}
@@ -1461,7 +1466,6 @@ add_back_to_lru:
 			spin_unlock(&gl->gl_lockref.lock);
 			goto add_back_to_lru;
 		}
-		clear_bit(GLF_LRU, &gl->gl_flags);
 		gl->gl_lockref.count++;
 		if (demote_ok(gl))
 			handle_callback(gl, LM_ST_UNLOCKED, 0, false);
@@ -1496,6 +1500,7 @@ static long gfs2_scan_glock_lru(int nr)
 		if (!test_bit(GLF_LOCK, &gl->gl_flags)) {
 			list_move(&gl->gl_lru, &dispose);
 			atomic_dec(&lru_count);
+			clear_bit(GLF_LRU, &gl->gl_flags);
 			freed++;
 			continue;
 		}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/gfs2/lock_dlm.c linux-libre-4.14.123-gnu/fs/gfs2/lock_dlm.c
--- linux-libre-4.14.122-gnu/fs/gfs2/lock_dlm.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/gfs2/lock_dlm.c	2019-05-31 09:47:36.000000000 -0400
@@ -31,9 +31,10 @@
  * @delta is the difference between the current rtt sample and the
  * running average srtt. We add 1/8 of that to the srtt in order to
  * update the current srtt estimate. The variance estimate is a bit
- * more complicated. We subtract the abs value of the @delta from
- * the current variance estimate and add 1/4 of that to the running
- * total.
+ * more complicated. We subtract the current variance estimate from
+ * the abs value of the @delta and add 1/4 of that to the running
+ * total.  That's equivalent to 3/4 of the current variance
+ * estimate plus 1/4 of the abs of @delta.
  *
  * Note that the index points at the array entry containing the smoothed
  * mean value, and the variance is always in the following entry
@@ -49,7 +50,7 @@ static inline void gfs2_update_stats(str
 	s64 delta = sample - s->stats[index];
 	s->stats[index] += (delta >> 3);
 	index++;
-	s->stats[index] += ((abs(delta) - s->stats[index]) >> 2);
+	s->stats[index] += (s64)(abs(delta) - s->stats[index]) >> 2;
 }
 
 /**
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/gfs2/log.c linux-libre-4.14.123-gnu/fs/gfs2/log.c
--- linux-libre-4.14.122-gnu/fs/gfs2/log.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/gfs2/log.c	2019-05-31 09:47:36.000000000 -0400
@@ -588,7 +588,8 @@ void gfs2_add_revoke(struct gfs2_sbd *sd
 	bd->bd_bh = NULL;
 	bd->bd_ops = &gfs2_revoke_lops;
 	sdp->sd_log_num_revoke++;
-	atomic_inc(&gl->gl_revokes);
+	if (atomic_inc_return(&gl->gl_revokes) == 1)
+		gfs2_glock_hold(gl);
 	set_bit(GLF_LFLUSH, &gl->gl_flags);
 	list_add(&bd->bd_list, &sdp->sd_log_le_revoke);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/gfs2/lops.c linux-libre-4.14.123-gnu/fs/gfs2/lops.c
--- linux-libre-4.14.122-gnu/fs/gfs2/lops.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/gfs2/lops.c	2019-05-31 09:47:36.000000000 -0400
@@ -660,8 +660,10 @@ static void revoke_lo_after_commit(struc
 		bd = list_entry(head->next, struct gfs2_bufdata, bd_list);
 		list_del_init(&bd->bd_list);
 		gl = bd->bd_gl;
-		atomic_dec(&gl->gl_revokes);
-		clear_bit(GLF_LFLUSH, &gl->gl_flags);
+		if (atomic_dec_return(&gl->gl_revokes) == 0) {
+			clear_bit(GLF_LFLUSH, &gl->gl_flags);
+			gfs2_glock_queue_put(gl);
+		}
 		kmem_cache_free(gfs2_bufdata_cachep, bd);
 	}
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/hugetlbfs/inode.c linux-libre-4.14.123-gnu/fs/hugetlbfs/inode.c
--- linux-libre-4.14.122-gnu/fs/hugetlbfs/inode.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/hugetlbfs/inode.c	2019-05-31 09:47:36.000000000 -0400
@@ -436,9 +436,7 @@ static void remove_inode_hugepages(struc
 			u32 hash;
 
 			index = page->index;
-			hash = hugetlb_fault_mutex_hash(h, current->mm,
-							&pseudo_vma,
-							mapping, index, 0);
+			hash = hugetlb_fault_mutex_hash(h, mapping, index, 0);
 			mutex_lock(&hugetlb_fault_mutex_table[hash]);
 
 			/*
@@ -557,7 +555,6 @@ static long hugetlbfs_fallocate(struct f
 	struct address_space *mapping = inode->i_mapping;
 	struct hstate *h = hstate_inode(inode);
 	struct vm_area_struct pseudo_vma;
-	struct mm_struct *mm = current->mm;
 	loff_t hpage_size = huge_page_size(h);
 	unsigned long hpage_shift = huge_page_shift(h);
 	pgoff_t start, index, end;
@@ -621,8 +618,7 @@ static long hugetlbfs_fallocate(struct f
 		addr = index * hpage_size;
 
 		/* mutex taken here, fault path and hole punch */
-		hash = hugetlb_fault_mutex_hash(h, mm, &pseudo_vma, mapping,
-						index, addr);
+		hash = hugetlb_fault_mutex_hash(h, mapping, index, addr);
 		mutex_lock(&hugetlb_fault_mutex_table[hash]);
 
 		/* See if already present in mapping to avoid alloc/free */
diff -druNp --no-dereference linux-libre-4.14.122-gnu/fs/nfs/client.c linux-libre-4.14.123-gnu/fs/nfs/client.c
--- linux-libre-4.14.122-gnu/fs/nfs/client.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/fs/nfs/client.c	2019-05-31 09:47:36.000000000 -0400
@@ -290,6 +290,7 @@ static struct nfs_client *nfs_match_clie
 	struct nfs_client *clp;
 	const struct sockaddr *sap = data->addr;
 	struct nfs_net *nn = net_generic(data->net, nfs_net_id);
+	int error;
 
 again:
 	list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
@@ -302,9 +303,11 @@ again:
 		if (clp->cl_cons_state > NFS_CS_READY) {
 			atomic_inc(&clp->cl_count);
 			spin_unlock(&nn->nfs_client_lock);
-			nfs_wait_client_init_complete(clp);
+			error = nfs_wait_client_init_complete(clp);
 			nfs_put_client(clp);
 			spin_lock(&nn->nfs_client_lock);
+			if (error < 0)
+				return ERR_PTR(error);
 			goto again;
 		}
 
@@ -413,6 +416,8 @@ struct nfs_client *nfs_get_client(const
 		clp = nfs_match_client(cl_init);
 		if (clp) {
 			spin_unlock(&nn->nfs_client_lock);
+			if (IS_ERR(clp))
+				return clp;
 			if (new)
 				new->rpc_ops->free_client(new);
 			return nfs_found_client(cl_init, clp);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/bio.h linux-libre-4.14.123-gnu/include/linux/bio.h
--- linux-libre-4.14.122-gnu/include/linux/bio.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/bio.h	2019-05-31 09:47:36.000000000 -0400
@@ -260,7 +260,7 @@ static inline void bio_cnt_set(struct bi
 {
 	if (count != 1) {
 		bio->bi_flags |= (1 << BIO_REFFED);
-		smp_mb__before_atomic();
+		smp_mb();
 	}
 	atomic_set(&bio->__bi_cnt, count);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/cgroup-defs.h linux-libre-4.14.123-gnu/include/linux/cgroup-defs.h
--- linux-libre-4.14.122-gnu/include/linux/cgroup-defs.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/cgroup-defs.h	2019-05-31 09:47:36.000000000 -0400
@@ -287,6 +287,11 @@ struct cgroup {
 	 * Dying cgroups are cgroups which were deleted by a user,
 	 * but are still existing because someone else is holding a reference.
 	 * max_descendants is a maximum allowed number of descent cgroups.
+	 *
+	 * nr_descendants and nr_dying_descendants are protected
+	 * by cgroup_mutex and css_set_lock. It's fine to read them holding
+	 * any of cgroup_mutex and css_set_lock; for writing both locks
+	 * should be held.
 	 */
 	int nr_descendants;
 	int nr_dying_descendants;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/hid.h linux-libre-4.14.123-gnu/include/linux/hid.h
--- linux-libre-4.14.122-gnu/include/linux/hid.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/hid.h	2019-05-31 09:47:36.000000000 -0400
@@ -398,6 +398,7 @@ struct hid_global {
 
 struct hid_local {
 	unsigned usage[HID_MAX_USAGES]; /* usage array */
+	u8 usage_size[HID_MAX_USAGES]; /* usage size array */
 	unsigned collection_index[HID_MAX_USAGES]; /* collection index array */
 	unsigned usage_index;
 	unsigned usage_minimum;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/hugetlb.h linux-libre-4.14.123-gnu/include/linux/hugetlb.h
--- linux-libre-4.14.122-gnu/include/linux/hugetlb.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/hugetlb.h	2019-05-31 09:47:36.000000000 -0400
@@ -122,9 +122,7 @@ void putback_active_hugepage(struct page
 void free_huge_page(struct page *page);
 void hugetlb_fix_reserve_counts(struct inode *inode);
 extern struct mutex *hugetlb_fault_mutex_table;
-u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
-				struct vm_area_struct *vma,
-				struct address_space *mapping,
+u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
 				pgoff_t idx, unsigned long address);
 
 pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/iio/adc/ad_sigma_delta.h linux-libre-4.14.123-gnu/include/linux/iio/adc/ad_sigma_delta.h
--- linux-libre-4.14.122-gnu/include/linux/iio/adc/ad_sigma_delta.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/iio/adc/ad_sigma_delta.h	2019-05-31 09:47:36.000000000 -0400
@@ -66,6 +66,7 @@ struct ad_sigma_delta {
 	bool			irq_dis;
 
 	bool			bus_locked;
+	bool			keep_cs_asserted;
 
 	uint8_t			comm;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/include/linux/smpboot.h linux-libre-4.14.123-gnu/include/linux/smpboot.h
--- linux-libre-4.14.122-gnu/include/linux/smpboot.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/include/linux/smpboot.h	2019-05-31 09:47:36.000000000 -0400
@@ -31,7 +31,7 @@ struct smpboot_thread_data;
  * @thread_comm:	The base name of the thread
  */
 struct smp_hotplug_thread {
-	struct task_struct __percpu	**store;
+	struct task_struct		* __percpu *store;
 	struct list_head		list;
 	int				(*thread_should_run)(unsigned int cpu);
 	void				(*thread_fn)(unsigned int cpu);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/auditfilter.c linux-libre-4.14.123-gnu/kernel/auditfilter.c
--- linux-libre-4.14.122-gnu/kernel/auditfilter.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/auditfilter.c	2019-05-31 09:47:36.000000000 -0400
@@ -1094,22 +1094,24 @@ int audit_rule_change(int type, int seq,
 	int err = 0;
 	struct audit_entry *entry;
 
-	entry = audit_data_to_entry(data, datasz);
-	if (IS_ERR(entry))
-		return PTR_ERR(entry);
-
 	switch (type) {
 	case AUDIT_ADD_RULE:
+		entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 		err = audit_add_rule(entry);
 		audit_log_rule_change("add_rule", &entry->rule, !err);
 		break;
 	case AUDIT_DEL_RULE:
+		entry = audit_data_to_entry(data, datasz);
+		if (IS_ERR(entry))
+			return PTR_ERR(entry);
 		err = audit_del_rule(entry);
 		audit_log_rule_change("remove_rule", &entry->rule, !err);
 		break;
 	default:
-		err = -EINVAL;
 		WARN_ON(1);
+		return -EINVAL;
 	}
 
 	if (err || type == AUDIT_DEL_RULE) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/bpf/devmap.c linux-libre-4.14.123-gnu/kernel/bpf/devmap.c
--- linux-libre-4.14.122-gnu/kernel/bpf/devmap.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/bpf/devmap.c	2019-05-31 09:47:36.000000000 -0400
@@ -156,6 +156,9 @@ static void dev_map_free(struct bpf_map
 
 	synchronize_rcu();
 
+	/* Make sure prior __dev_map_entry_free() have completed. */
+	rcu_barrier();
+
 	/* To ensure all pending flush operations have completed wait for flush
 	 * bitmap to indicate all flush_needed bits to be zero on _all_ cpus.
 	 * Because the above synchronize_rcu() ensures the map is disconnected
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/cgroup/cgroup.c linux-libre-4.14.123-gnu/kernel/cgroup/cgroup.c
--- linux-libre-4.14.122-gnu/kernel/cgroup/cgroup.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/cgroup/cgroup.c	2019-05-31 09:47:36.000000000 -0400
@@ -4546,9 +4546,11 @@ static void css_release_work_fn(struct w
 		/* cgroup release path */
 		trace_cgroup_release(cgrp);
 
+		spin_lock_irq(&css_set_lock);
 		for (tcgrp = cgroup_parent(cgrp); tcgrp;
 		     tcgrp = cgroup_parent(tcgrp))
 			tcgrp->nr_dying_descendants--;
+		spin_unlock_irq(&css_set_lock);
 
 		cgroup_idr_remove(&cgrp->root->cgroup_idr, cgrp->id);
 		cgrp->id = -1;
@@ -4745,12 +4747,14 @@ static struct cgroup *cgroup_create(stru
 	cgrp->root = root;
 	cgrp->level = level;
 
+	spin_lock_irq(&css_set_lock);
 	for (tcgrp = cgrp; tcgrp; tcgrp = cgroup_parent(tcgrp)) {
 		cgrp->ancestor_ids[tcgrp->level] = tcgrp->id;
 
 		if (tcgrp != cgrp)
 			tcgrp->nr_descendants++;
 	}
+	spin_unlock_irq(&css_set_lock);
 
 	if (notify_on_release(parent))
 		set_bit(CGRP_NOTIFY_ON_RELEASE, &cgrp->flags);
@@ -5033,10 +5037,12 @@ static int cgroup_destroy_locked(struct
 	if (parent && cgroup_is_threaded(cgrp))
 		parent->nr_threaded_children--;
 
+	spin_lock_irq(&css_set_lock);
 	for (tcgrp = cgroup_parent(cgrp); tcgrp; tcgrp = cgroup_parent(tcgrp)) {
 		tcgrp->nr_descendants--;
 		tcgrp->nr_dying_descendants++;
 	}
+	spin_unlock_irq(&css_set_lock);
 
 	cgroup1_check_for_release(parent);
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/rcu/rcuperf.c linux-libre-4.14.123-gnu/kernel/rcu/rcuperf.c
--- linux-libre-4.14.122-gnu/kernel/rcu/rcuperf.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/rcu/rcuperf.c	2019-05-31 09:47:36.000000000 -0400
@@ -542,6 +542,10 @@ rcu_perf_cleanup(void)
 
 	if (torture_cleanup_begin())
 		return;
+	if (!cur_ops) {
+		torture_cleanup_end();
+		return;
+	}
 
 	if (reader_tasks) {
 		for (i = 0; i < nrealreaders; i++)
@@ -663,6 +667,7 @@ rcu_perf_init(void)
 			pr_alert(" %s", perf_ops[i]->name);
 		pr_alert("\n");
 		firsterr = -EINVAL;
+		cur_ops = NULL;
 		goto unwind;
 	}
 	if (cur_ops->init)
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/rcu/rcutorture.c linux-libre-4.14.123-gnu/kernel/rcu/rcutorture.c
--- linux-libre-4.14.122-gnu/kernel/rcu/rcutorture.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/rcu/rcutorture.c	2019-05-31 09:47:36.000000000 -0400
@@ -1599,6 +1599,10 @@ rcu_torture_cleanup(void)
 			cur_ops->cb_barrier();
 		return;
 	}
+	if (!cur_ops) {
+		torture_cleanup_end();
+		return;
+	}
 
 	rcu_torture_barrier_cleanup();
 	torture_stop_kthread(rcu_torture_stall, stall_task);
@@ -1734,6 +1738,7 @@ rcu_torture_init(void)
 			pr_alert(" %s", torture_ops[i]->name);
 		pr_alert("\n");
 		firsterr = -EINVAL;
+		cur_ops = NULL;
 		goto unwind;
 	}
 	if (cur_ops->fqs == NULL && fqs_duration != 0) {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/sched/core.c linux-libre-4.14.123-gnu/kernel/sched/core.c
--- linux-libre-4.14.122-gnu/kernel/sched/core.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/sched/core.c	2019-05-31 09:47:36.000000000 -0400
@@ -6380,6 +6380,8 @@ static void cpu_cgroup_attach(struct cgr
 static int cpu_shares_write_u64(struct cgroup_subsys_state *css,
 				struct cftype *cftype, u64 shareval)
 {
+	if (shareval > scale_load_down(ULONG_MAX))
+		shareval = MAX_SHARES;
 	return sched_group_set_shares(css_tg(css), scale_load(shareval));
 }
 
@@ -6482,8 +6484,10 @@ int tg_set_cfs_quota(struct task_group *
 	period = ktime_to_ns(tg->cfs_bandwidth.period);
 	if (cfs_quota_us < 0)
 		quota = RUNTIME_INF;
-	else
+	else if ((u64)cfs_quota_us <= U64_MAX / NSEC_PER_USEC)
 		quota = (u64)cfs_quota_us * NSEC_PER_USEC;
+	else
+		return -EINVAL;
 
 	return tg_set_cfs_bandwidth(tg, period, quota);
 }
@@ -6505,6 +6509,9 @@ int tg_set_cfs_period(struct task_group
 {
 	u64 quota, period;
 
+	if ((u64)cfs_period_us > U64_MAX / NSEC_PER_USEC)
+		return -EINVAL;
+
 	period = (u64)cfs_period_us * NSEC_PER_USEC;
 	quota = tg->cfs_bandwidth.quota;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/sched/rt.c linux-libre-4.14.123-gnu/kernel/sched/rt.c
--- linux-libre-4.14.122-gnu/kernel/sched/rt.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/sched/rt.c	2019-05-31 09:47:36.000000000 -0400
@@ -2533,6 +2533,8 @@ int sched_group_set_rt_runtime(struct ta
 	rt_runtime = (u64)rt_runtime_us * NSEC_PER_USEC;
 	if (rt_runtime_us < 0)
 		rt_runtime = RUNTIME_INF;
+	else if ((u64)rt_runtime_us > U64_MAX / NSEC_PER_USEC)
+		return -EINVAL;
 
 	return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);
 }
@@ -2553,6 +2555,9 @@ int sched_group_set_rt_period(struct tas
 {
 	u64 rt_runtime, rt_period;
 
+	if (rt_period_us > U64_MAX / NSEC_PER_USEC)
+		return -EINVAL;
+
 	rt_period = rt_period_us * NSEC_PER_USEC;
 	rt_runtime = tg->rt_bandwidth.rt_runtime;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/kernel/trace/trace_branch.c linux-libre-4.14.123-gnu/kernel/trace/trace_branch.c
--- linux-libre-4.14.122-gnu/kernel/trace/trace_branch.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/kernel/trace/trace_branch.c	2019-05-31 09:47:36.000000000 -0400
@@ -205,6 +205,8 @@ void trace_likely_condition(struct ftrac
 void ftrace_likely_update(struct ftrace_likely_data *f, int val,
 			  int expect, int is_constant)
 {
+	unsigned long flags = user_access_save();
+
 	/* A constant is always correct */
 	if (is_constant) {
 		f->constant++;
@@ -223,6 +225,8 @@ void ftrace_likely_update(struct ftrace_
 		f->data.correct++;
 	else
 		f->data.incorrect++;
+
+	user_access_restore(flags);
 }
 EXPORT_SYMBOL(ftrace_likely_update);
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/lib/kobject_uevent.c linux-libre-4.14.123-gnu/lib/kobject_uevent.c
--- linux-libre-4.14.122-gnu/lib/kobject_uevent.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/lib/kobject_uevent.c	2019-05-31 09:47:36.000000000 -0400
@@ -340,6 +340,13 @@ int kobject_uevent_env(struct kobject *k
 	struct uevent_sock *ue_sk;
 #endif
 
+	/*
+	 * Mark "remove" event done regardless of result, for some subsystems
+	 * do not want to re-trigger "remove" event via automatic cleanup.
+	 */
+	if (action == KOBJ_REMOVE)
+		kobj->state_remove_uevent_sent = 1;
+
 	pr_debug("kobject: '%s' (%p): %s\n",
 		 kobject_name(kobj), kobj, __func__);
 
@@ -441,10 +448,6 @@ int kobject_uevent_env(struct kobject *k
 		kobj->state_add_uevent_sent = 1;
 		break;
 
-	case KOBJ_REMOVE:
-		kobj->state_remove_uevent_sent = 1;
-		break;
-
 	case KOBJ_UNBIND:
 		zap_modalias_env(env);
 		break;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/lib/sbitmap.c linux-libre-4.14.123-gnu/lib/sbitmap.c
--- linux-libre-4.14.122-gnu/lib/sbitmap.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/lib/sbitmap.c	2019-05-31 09:47:36.000000000 -0400
@@ -338,7 +338,7 @@ void sbitmap_queue_resize(struct sbitmap
 		 * Pairs with the memory barrier in sbq_wake_up() to ensure that
 		 * the batch size is updated before the wait counts.
 		 */
-		smp_mb__before_atomic();
+		smp_mb();
 		for (i = 0; i < SBQ_WAIT_QUEUES; i++)
 			atomic_set(&sbq->ws[i].wait_cnt, 1);
 	}
diff -druNp --no-dereference linux-libre-4.14.122-gnu/lib/strncpy_from_user.c linux-libre-4.14.123-gnu/lib/strncpy_from_user.c
--- linux-libre-4.14.122-gnu/lib/strncpy_from_user.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/lib/strncpy_from_user.c	2019-05-31 09:47:36.000000000 -0400
@@ -23,10 +23,11 @@
  * hit it), 'max' is the address space maximum (and we return
  * -EFAULT if we hit it).
  */
-static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
+static inline long do_strncpy_from_user(char *dst, const char __user *src,
+					unsigned long count, unsigned long max)
 {
 	const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-	long res = 0;
+	unsigned long res = 0;
 
 	/*
 	 * Truncate 'max' to the user-specified limit, so that
diff -druNp --no-dereference linux-libre-4.14.122-gnu/lib/strnlen_user.c linux-libre-4.14.123-gnu/lib/strnlen_user.c
--- linux-libre-4.14.122-gnu/lib/strnlen_user.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/lib/strnlen_user.c	2019-05-31 09:47:36.000000000 -0400
@@ -28,7 +28,7 @@
 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
 {
 	const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
-	long align, res = 0;
+	unsigned long align, res = 0;
 	unsigned long c;
 
 	/*
@@ -42,7 +42,7 @@ static inline long do_strnlen_user(const
 	 * Do everything aligned. But that means that we
 	 * need to also expand the maximum..
 	 */
-	align = (sizeof(long) - 1) & (unsigned long)src;
+	align = (sizeof(unsigned long) - 1) & (unsigned long)src;
 	src -= align;
 	max += align;
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/Makefile linux-libre-4.14.123-gnu/Makefile
--- linux-libre-4.14.122-gnu/Makefile	2019-05-26 00:34:46.000000000 -0400
+++ linux-libre-4.14.123-gnu/Makefile	2019-05-31 18:13:26.000000000 -0400
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 122
+SUBLEVEL = 123
 EXTRAVERSION = -gnu
 NAME = Petit Gorille
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/mm/hugetlb.c linux-libre-4.14.123-gnu/mm/hugetlb.c
--- linux-libre-4.14.122-gnu/mm/hugetlb.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/mm/hugetlb.c	2019-05-31 09:47:36.000000000 -0400
@@ -3729,8 +3729,8 @@ retry:
 			 * handling userfault.  Reacquire after handling
 			 * fault to make calling code simpler.
 			 */
-			hash = hugetlb_fault_mutex_hash(h, mm, vma, mapping,
-							idx, address);
+			hash = hugetlb_fault_mutex_hash(h, mapping, idx,
+							address);
 			mutex_unlock(&hugetlb_fault_mutex_table[hash]);
 			ret = handle_userfault(&vmf, VM_UFFD_MISSING);
 			mutex_lock(&hugetlb_fault_mutex_table[hash]);
@@ -3842,21 +3842,14 @@ backout_unlocked:
 }
 
 #ifdef CONFIG_SMP
-u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
-			    struct vm_area_struct *vma,
-			    struct address_space *mapping,
+u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
 			    pgoff_t idx, unsigned long address)
 {
 	unsigned long key[2];
 	u32 hash;
 
-	if (vma->vm_flags & VM_SHARED) {
-		key[0] = (unsigned long) mapping;
-		key[1] = idx;
-	} else {
-		key[0] = (unsigned long) mm;
-		key[1] = address >> huge_page_shift(h);
-	}
+	key[0] = (unsigned long) mapping;
+	key[1] = idx;
 
 	hash = jhash2((u32 *)&key, sizeof(key)/sizeof(u32), 0);
 
@@ -3867,9 +3860,7 @@ u32 hugetlb_fault_mutex_hash(struct hsta
  * For uniprocesor systems we always use a single mutex, so just
  * return 0 and avoid the hashing overhead.
  */
-u32 hugetlb_fault_mutex_hash(struct hstate *h, struct mm_struct *mm,
-			    struct vm_area_struct *vma,
-			    struct address_space *mapping,
+u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,
 			    pgoff_t idx, unsigned long address)
 {
 	return 0;
@@ -3915,7 +3906,7 @@ int hugetlb_fault(struct mm_struct *mm,
 	 * get spurious allocation failures if two CPUs race to instantiate
 	 * the same page in the page cache.
 	 */
-	hash = hugetlb_fault_mutex_hash(h, mm, vma, mapping, idx, address);
+	hash = hugetlb_fault_mutex_hash(h, mapping, idx, address);
 	mutex_lock(&hugetlb_fault_mutex_table[hash]);
 
 	entry = huge_ptep_get(ptep);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/mm/userfaultfd.c linux-libre-4.14.123-gnu/mm/userfaultfd.c
--- linux-libre-4.14.122-gnu/mm/userfaultfd.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/mm/userfaultfd.c	2019-05-31 09:47:36.000000000 -0400
@@ -272,8 +272,7 @@ retry:
 		 */
 		idx = linear_page_index(dst_vma, dst_addr);
 		mapping = dst_vma->vm_file->f_mapping;
-		hash = hugetlb_fault_mutex_hash(h, dst_mm, dst_vma, mapping,
-								idx, dst_addr);
+		hash = hugetlb_fault_mutex_hash(h, mapping, idx, dst_addr);
 		mutex_lock(&hugetlb_fault_mutex_table[hash]);
 
 		err = -ENOMEM;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/batman-adv/distributed-arp-table.c linux-libre-4.14.123-gnu/net/batman-adv/distributed-arp-table.c
--- linux-libre-4.14.122-gnu/net/batman-adv/distributed-arp-table.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/batman-adv/distributed-arp-table.c	2019-05-31 09:47:36.000000000 -0400
@@ -1240,7 +1240,6 @@ bool batadv_dat_snoop_incoming_arp_reply
 			   hw_src, &ip_src, hw_dst, &ip_dst,
 			   dat_entry->mac_addr,	&dat_entry->ip);
 		dropped = true;
-		goto out;
 	}
 
 	/* Update our internal cache with both the IP addresses the node got
@@ -1249,6 +1248,9 @@ bool batadv_dat_snoop_incoming_arp_reply
 	batadv_dat_entry_add(bat_priv, ip_src, hw_src, vid);
 	batadv_dat_entry_add(bat_priv, ip_dst, hw_dst, vid);
 
+	if (dropped)
+		goto out;
+
 	/* If BLA is enabled, only forward ARP replies if we have claimed the
 	 * source of the ARP reply or if no one else of the same backbone has
 	 * already claimed that client. This prevents that different gateways
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/batman-adv/main.c linux-libre-4.14.123-gnu/net/batman-adv/main.c
--- linux-libre-4.14.122-gnu/net/batman-adv/main.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/batman-adv/main.c	2019-05-31 09:47:36.000000000 -0400
@@ -153,6 +153,7 @@ int batadv_mesh_init(struct net_device *
 	spin_lock_init(&bat_priv->tt.commit_lock);
 	spin_lock_init(&bat_priv->gw.list_lock);
 #ifdef CONFIG_BATMAN_ADV_MCAST
+	spin_lock_init(&bat_priv->mcast.mla_lock);
 	spin_lock_init(&bat_priv->mcast.want_lists_lock);
 #endif
 	spin_lock_init(&bat_priv->tvlv.container_list_lock);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/batman-adv/multicast.c linux-libre-4.14.123-gnu/net/batman-adv/multicast.c
--- linux-libre-4.14.122-gnu/net/batman-adv/multicast.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/batman-adv/multicast.c	2019-05-31 09:47:36.000000000 -0400
@@ -269,8 +269,6 @@ static void batadv_mcast_mla_list_free(s
  * translation table except the ones listed in the given mcast_list.
  *
  * If mcast_list is NULL then all are retracted.
- *
- * Do not call outside of the mcast worker! (or cancel mcast worker first)
  */
 static void batadv_mcast_mla_tt_retract(struct batadv_priv *bat_priv,
 					struct hlist_head *mcast_list)
@@ -278,8 +276,6 @@ static void batadv_mcast_mla_tt_retract(
 	struct batadv_hw_addr *mcast_entry;
 	struct hlist_node *tmp;
 
-	WARN_ON(delayed_work_pending(&bat_priv->mcast.work));
-
 	hlist_for_each_entry_safe(mcast_entry, tmp, &bat_priv->mcast.mla_list,
 				  list) {
 		if (mcast_list &&
@@ -303,8 +299,6 @@ static void batadv_mcast_mla_tt_retract(
  *
  * Adds multicast listener announcements from the given mcast_list to the
  * translation table if they have not been added yet.
- *
- * Do not call outside of the mcast worker! (or cancel mcast worker first)
  */
 static void batadv_mcast_mla_tt_add(struct batadv_priv *bat_priv,
 				    struct hlist_head *mcast_list)
@@ -312,8 +306,6 @@ static void batadv_mcast_mla_tt_add(stru
 	struct batadv_hw_addr *mcast_entry;
 	struct hlist_node *tmp;
 
-	WARN_ON(delayed_work_pending(&bat_priv->mcast.work));
-
 	if (!mcast_list)
 		return;
 
@@ -600,7 +592,10 @@ static void batadv_mcast_mla_update(stru
 	priv_mcast = container_of(delayed_work, struct batadv_priv_mcast, work);
 	bat_priv = container_of(priv_mcast, struct batadv_priv, mcast);
 
+	spin_lock(&bat_priv->mcast.mla_lock);
 	__batadv_mcast_mla_update(bat_priv);
+	spin_unlock(&bat_priv->mcast.mla_lock);
+
 	batadv_mcast_start_timer(bat_priv);
 }
 
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/batman-adv/types.h linux-libre-4.14.123-gnu/net/batman-adv/types.h
--- linux-libre-4.14.122-gnu/net/batman-adv/types.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/batman-adv/types.h	2019-05-31 09:47:36.000000000 -0400
@@ -798,6 +798,7 @@ struct batadv_mcast_querier_state {
  * @flags: the flags we have last sent in our mcast tvlv
  * @enabled: whether the multicast tvlv is currently enabled
  * @bridged: whether the soft interface has a bridge on top
+ * @mla_lock: a lock protecting mla_list and mla_flags
  * @num_disabled: number of nodes that have no mcast tvlv
  * @num_want_all_unsnoopables: number of nodes wanting unsnoopable IP traffic
  * @num_want_all_ipv4: counter for items in want_all_ipv4_list
@@ -816,6 +817,7 @@ struct batadv_priv_mcast {
 	u8 flags;
 	bool enabled;
 	bool bridged;
+	spinlock_t mla_lock;
 	atomic_t num_disabled;
 	atomic_t num_want_all_unsnoopables;
 	atomic_t num_want_all_ipv4;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/ipv4/ip_gre.c linux-libre-4.14.123-gnu/net/ipv4/ip_gre.c
--- linux-libre-4.14.122-gnu/net/ipv4/ip_gre.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/ipv4/ip_gre.c	2019-05-31 09:47:36.000000000 -0400
@@ -689,7 +689,7 @@ static void erspan_build_header(struct s
 				__be32 id, u32 index, bool truncate)
 {
 	struct iphdr *iphdr = ip_hdr(skb);
-	struct ethhdr *eth = eth_hdr(skb);
+	struct ethhdr *eth = (struct ethhdr *)skb->data;
 	enum erspan_encap_type enc_type;
 	struct erspanhdr *ershdr;
 	struct qtag_prefix {
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/mac80211/mlme.c linux-libre-4.14.123-gnu/net/mac80211/mlme.c
--- linux-libre-4.14.122-gnu/net/mac80211/mlme.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/mac80211/mlme.c	2019-05-31 09:47:36.000000000 -0400
@@ -1071,9 +1071,6 @@ static void ieee80211_chswitch_work(stru
 		goto out;
 	}
 
-	/* XXX: shouldn't really modify cfg80211-owned data! */
-	ifmgd->associated->channel = sdata->csa_chandef.chan;
-
 	ifmgd->csa_waiting_bcn = true;
 
 	ieee80211_sta_reset_beacon_monitor(sdata);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/net/wireless/nl80211.c linux-libre-4.14.123-gnu/net/wireless/nl80211.c
--- linux-libre-4.14.122-gnu/net/wireless/nl80211.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/net/wireless/nl80211.c	2019-05-31 09:47:36.000000000 -0400
@@ -14706,6 +14706,11 @@ void cfg80211_ch_switch_notify(struct ne
 
 	wdev->chandef = *chandef;
 	wdev->preset_chandef = *chandef;
+
+	if (wdev->iftype == NL80211_IFTYPE_STATION &&
+	    !WARN_ON(!wdev->current_bss))
+		wdev->current_bss->pub.channel = chandef->chan;
+
 	nl80211_ch_switch_notify(rdev, dev, chandef, GFP_KERNEL,
 				 NL80211_CMD_CH_SWITCH_NOTIFY, 0);
 }
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/codecs/hdmi-codec.c linux-libre-4.14.123-gnu/sound/soc/codecs/hdmi-codec.c
--- linux-libre-4.14.122-gnu/sound/soc/codecs/hdmi-codec.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/codecs/hdmi-codec.c	2019-05-31 09:47:36.000000000 -0400
@@ -446,8 +446,12 @@ static int hdmi_codec_startup(struct snd
 		if (!ret) {
 			ret = snd_pcm_hw_constraint_eld(substream->runtime,
 							hcp->eld);
-			if (ret)
+			if (ret) {
+				mutex_lock(&hcp->current_stream_lock);
+				hcp->current_stream = NULL;
+				mutex_unlock(&hcp->current_stream_lock);
 				return ret;
+			}
 		}
 		/* Select chmap supported */
 		hdmi_codec_eld_chmap(hcp);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/davinci/davinci-mcasp.c linux-libre-4.14.123-gnu/sound/soc/davinci/davinci-mcasp.c
--- linux-libre-4.14.122-gnu/sound/soc/davinci/davinci-mcasp.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/davinci/davinci-mcasp.c	2019-05-31 09:47:36.000000000 -0400
@@ -43,6 +43,7 @@
 
 #define MCASP_MAX_AFIFO_DEPTH	64
 
+#ifdef CONFIG_PM
 static u32 context_regs[] = {
 	DAVINCI_MCASP_TXFMCTL_REG,
 	DAVINCI_MCASP_RXFMCTL_REG,
@@ -65,6 +66,7 @@ struct davinci_mcasp_context {
 	u32	*xrsr_regs; /* for serializer configuration */
 	bool	pm_state;
 };
+#endif
 
 struct davinci_mcasp_ruledata {
 	struct davinci_mcasp *mcasp;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/fsl/eukrea-tlv320.c linux-libre-4.14.123-gnu/sound/soc/fsl/eukrea-tlv320.c
--- linux-libre-4.14.122-gnu/sound/soc/fsl/eukrea-tlv320.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/fsl/eukrea-tlv320.c	2019-05-31 09:47:36.000000000 -0400
@@ -119,13 +119,13 @@ static int eukrea_tlv320_probe(struct pl
 		if (ret) {
 			dev_err(&pdev->dev,
 				"fsl,mux-int-port node missing or invalid.\n");
-			return ret;
+			goto err;
 		}
 		ret = of_property_read_u32(np, "fsl,mux-ext-port", &ext_port);
 		if (ret) {
 			dev_err(&pdev->dev,
 				"fsl,mux-ext-port node missing or invalid.\n");
-			return ret;
+			goto err;
 		}
 
 		/*
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/fsl/fsl_sai.c linux-libre-4.14.123-gnu/sound/soc/fsl/fsl_sai.c
--- linux-libre-4.14.122-gnu/sound/soc/fsl/fsl_sai.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/fsl/fsl_sai.c	2019-05-31 09:47:36.000000000 -0400
@@ -274,12 +274,14 @@ static int fsl_sai_set_dai_fmt_tr(struct
 	case SND_SOC_DAIFMT_CBS_CFS:
 		val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
 		val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
+		sai->is_slave_mode = false;
 		break;
 	case SND_SOC_DAIFMT_CBM_CFM:
 		sai->is_slave_mode = true;
 		break;
 	case SND_SOC_DAIFMT_CBS_CFM:
 		val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
+		sai->is_slave_mode = false;
 		break;
 	case SND_SOC_DAIFMT_CBM_CFS:
 		val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/fsl/fsl_utils.c linux-libre-4.14.123-gnu/sound/soc/fsl/fsl_utils.c
--- linux-libre-4.14.122-gnu/sound/soc/fsl/fsl_utils.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/fsl/fsl_utils.c	2019-05-31 09:47:36.000000000 -0400
@@ -75,6 +75,7 @@ int fsl_asoc_get_dma_channel(struct devi
 	iprop = of_get_property(dma_np, "cell-index", NULL);
 	if (!iprop) {
 		of_node_put(dma_np);
+		of_node_put(dma_channel_np);
 		return -EINVAL;
 	}
 	*dma_id = be32_to_cpup(iprop);
diff -druNp --no-dereference linux-libre-4.14.122-gnu/sound/soc/fsl/Kconfig linux-libre-4.14.123-gnu/sound/soc/fsl/Kconfig
--- linux-libre-4.14.122-gnu/sound/soc/fsl/Kconfig	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/sound/soc/fsl/Kconfig	2019-05-31 09:47:36.000000000 -0400
@@ -173,16 +173,17 @@ config SND_MPC52xx_SOC_EFIKA
 
 endif # SND_POWERPC_SOC
 
+config SND_SOC_IMX_PCM_FIQ
+	tristate
+	default y if SND_SOC_IMX_SSI=y && (SND_SOC_FSL_SSI=m || SND_SOC_FSL_SPDIF=m) && (MXC_TZIC || MXC_AVIC)
+	select FIQ
+
 if SND_IMX_SOC
 
 config SND_SOC_IMX_SSI
 	tristate
 	select SND_SOC_FSL_UTILS
 
-config SND_SOC_IMX_PCM_FIQ
-	tristate
-	select FIQ
-
 comment "SoC Audio support for Freescale i.MX boards:"
 
 config SND_MXC_SOC_WM1133_EV1
diff -druNp --no-dereference linux-libre-4.14.122-gnu/tools/lib/bpf/bpf.c linux-libre-4.14.123-gnu/tools/lib/bpf/bpf.c
--- linux-libre-4.14.122-gnu/tools/lib/bpf/bpf.c	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/tools/lib/bpf/bpf.c	2019-05-31 09:47:36.000000000 -0400
@@ -41,6 +41,8 @@
 #  define __NR_bpf 349
 # elif defined(__s390__)
 #  define __NR_bpf 351
+# elif defined(__arc__)
+#  define __NR_bpf 280
 # else
 #  error __NR_bpf not defined. libbpf does not support your arch.
 # endif
diff -druNp --no-dereference linux-libre-4.14.122-gnu/tools/lib/bpf/bpf.h linux-libre-4.14.123-gnu/tools/lib/bpf/bpf.h
--- linux-libre-4.14.122-gnu/tools/lib/bpf/bpf.h	2019-05-25 12:25:38.000000000 -0400
+++ linux-libre-4.14.123-gnu/tools/lib/bpf/bpf.h	2019-05-31 09:47:36.000000000 -0400
@@ -23,6 +23,7 @@
 
 #include <linux/bpf.h>
 #include <stddef.h>
+#include <stdint.h>
 
 int bpf_create_map_node(enum bpf_map_type map_type, int key_size,
 			int value_size, int max_entries, __u32 map_flags,
