diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/arm/boot/compressed/libfdt_env.h linux-libre-4.4.208-gnu/arch/arm/boot/compressed/libfdt_env.h
--- linux-libre-4.4.207-gnu/arch/arm/boot/compressed/libfdt_env.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/arm/boot/compressed/libfdt_env.h	2020-01-04 07:34:38.000000000 -0500
@@ -1,11 +1,13 @@
 #ifndef _ARM_LIBFDT_ENV_H
 #define _ARM_LIBFDT_ENV_H
 
+#include <linux/limits.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <asm/byteorder.h>
 
-#define INT_MAX			((int)(~0U>>1))
+#define INT32_MAX	S32_MAX
+#define UINT32_MAX	U32_MAX
 
 typedef __be16 fdt16_t;
 typedef __be32 fdt32_t;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/arm64/kernel/psci.c linux-libre-4.4.208-gnu/arch/arm64/kernel/psci.c
--- linux-libre-4.4.207-gnu/arch/arm64/kernel/psci.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/arm64/kernel/psci.c	2020-01-04 07:34:38.000000000 -0500
@@ -151,7 +151,8 @@ static void cpu_psci_cpu_die(unsigned in
 
 static int cpu_psci_cpu_kill(unsigned int cpu)
 {
-	int err, i;
+	int err;
+	unsigned long start, end;
 
 	if (!psci_ops.affinity_info)
 		return 0;
@@ -161,16 +162,18 @@ static int cpu_psci_cpu_kill(unsigned in
 	 * while it is dying. So, try again a few times.
 	 */
 
-	for (i = 0; i < 10; i++) {
+	start = jiffies;
+	end = start + msecs_to_jiffies(100);
+	do {
 		err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);
 		if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {
-			pr_info("CPU%d killed.\n", cpu);
+			pr_info("CPU%d killed (polled %d ms)\n", cpu,
+				jiffies_to_msecs(jiffies - start));
 			return 0;
 		}
 
-		msleep(10);
-		pr_info("Retrying again to check for CPU kill\n");
-	}
+		usleep_range(100, 1000);
+	} while (time_before(jiffies, end));
 
 	pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",
 			cpu, err);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/powerpc/boot/libfdt_env.h linux-libre-4.4.208-gnu/arch/powerpc/boot/libfdt_env.h
--- linux-libre-4.4.207-gnu/arch/powerpc/boot/libfdt_env.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/powerpc/boot/libfdt_env.h	2020-01-04 07:34:38.000000000 -0500
@@ -5,6 +5,8 @@
 #include <string.h>
 
 #define INT_MAX			((int)(~0U>>1))
+#define UINT32_MAX		((u32)~0U)
+#define INT32_MAX		((s32)(UINT32_MAX >> 1))
 
 #include "of.h"
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/powerpc/kernel/irq.c linux-libre-4.4.208-gnu/arch/powerpc/kernel/irq.c
--- linux-libre-4.4.207-gnu/arch/powerpc/kernel/irq.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/powerpc/kernel/irq.c	2020-01-04 07:34:38.000000000 -0500
@@ -484,8 +484,6 @@ void __do_irq(struct pt_regs *regs)
 
 	trace_irq_entry(regs);
 
-	check_stack_overflow();
-
 	/*
 	 * Query the platform PIC for the interrupt & ack it.
 	 *
@@ -517,6 +515,8 @@ void do_IRQ(struct pt_regs *regs)
 	irqtp = hardirq_ctx[raw_smp_processor_id()];
 	sirqtp = softirq_ctx[raw_smp_processor_id()];
 
+	check_stack_overflow();
+
 	/* Already there ? */
 	if (unlikely(curtp == irqtp || curtp == sirqtp)) {
 		__do_irq(regs);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/powerpc/kernel/security.c linux-libre-4.4.208-gnu/arch/powerpc/kernel/security.c
--- linux-libre-4.4.207-gnu/arch/powerpc/kernel/security.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/powerpc/kernel/security.c	2020-01-04 07:34:38.000000000 -0500
@@ -135,32 +135,33 @@ ssize_t cpu_show_meltdown(struct device
 
 	thread_priv = security_ftr_enabled(SEC_FTR_L1D_THREAD_PRIV);
 
-	if (rfi_flush || thread_priv) {
+	if (rfi_flush) {
 		struct seq_buf s;
 		seq_buf_init(&s, buf, PAGE_SIZE - 1);
 
-		seq_buf_printf(&s, "Mitigation: ");
-
-		if (rfi_flush)
-			seq_buf_printf(&s, "RFI Flush");
-
-		if (rfi_flush && thread_priv)
-			seq_buf_printf(&s, ", ");
-
+		seq_buf_printf(&s, "Mitigation: RFI Flush");
 		if (thread_priv)
-			seq_buf_printf(&s, "L1D private per thread");
+			seq_buf_printf(&s, ", L1D private per thread");
 
 		seq_buf_printf(&s, "\n");
 
 		return s.len;
 	}
 
+	if (thread_priv)
+		return sprintf(buf, "Vulnerable: L1D private per thread\n");
+
 	if (!security_ftr_enabled(SEC_FTR_L1D_FLUSH_HV) &&
 	    !security_ftr_enabled(SEC_FTR_L1D_FLUSH_PR))
 		return sprintf(buf, "Not affected\n");
 
 	return sprintf(buf, "Vulnerable\n");
 }
+
+ssize_t cpu_show_l1tf(struct device *dev, struct device_attribute *attr, char *buf)
+{
+	return cpu_show_meltdown(dev, attr, buf);
+}
 #endif
 
 ssize_t cpu_show_spectre_v1(struct device *dev, struct device_attribute *attr, char *buf)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/powerpc/kernel/time.c linux-libre-4.4.208-gnu/arch/powerpc/kernel/time.c
--- linux-libre-4.4.207-gnu/arch/powerpc/kernel/time.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/powerpc/kernel/time.c	2020-01-04 07:34:38.000000000 -0500
@@ -245,7 +245,7 @@ static u64 scan_dispatch_log(u64 stop_tb
  * Accumulate stolen time by scanning the dispatch trace log.
  * Called on entry from user mode.
  */
-void accumulate_stolen_time(void)
+void notrace accumulate_stolen_time(void)
 {
 	u64 sst, ust;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/powerpc/platforms/pseries/cmm.c linux-libre-4.4.208-gnu/arch/powerpc/platforms/pseries/cmm.c
--- linux-libre-4.4.207-gnu/arch/powerpc/platforms/pseries/cmm.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/powerpc/platforms/pseries/cmm.c	2020-01-04 07:34:38.000000000 -0500
@@ -391,6 +391,10 @@ static struct bus_type cmm_subsys = {
 	.dev_name = "cmm",
 };
 
+static void cmm_release_device(struct device *dev)
+{
+}
+
 /**
  * cmm_sysfs_register - Register with sysfs
  *
@@ -406,6 +410,7 @@ static int cmm_sysfs_register(struct dev
 
 	dev->id = 0;
 	dev->bus = &cmm_subsys;
+	dev->release = cmm_release_device;
 
 	if ((rc = device_register(dev)))
 		goto subsys_unregister;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/s390/kernel/perf_cpum_sf.c linux-libre-4.4.208-gnu/arch/s390/kernel/perf_cpum_sf.c
--- linux-libre-4.4.207-gnu/arch/s390/kernel/perf_cpum_sf.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/s390/kernel/perf_cpum_sf.c	2020-01-04 07:34:38.000000000 -0500
@@ -185,7 +185,7 @@ static int realloc_sampling_buffer(struc
 				   unsigned long num_sdb, gfp_t gfp_flags)
 {
 	int i, rc;
-	unsigned long *new, *tail;
+	unsigned long *new, *tail, *tail_prev = NULL;
 
 	if (!sfb->sdbt || !sfb->tail)
 		return -EINVAL;
@@ -224,6 +224,7 @@ static int realloc_sampling_buffer(struc
 			sfb->num_sdbt++;
 			/* Link current page to tail of chain */
 			*tail = (unsigned long)(void *) new + 1;
+			tail_prev = tail;
 			tail = new;
 		}
 
@@ -233,10 +234,22 @@ static int realloc_sampling_buffer(struc
 		 * issue, a new realloc call (if required) might succeed.
 		 */
 		rc = alloc_sample_data_block(tail, gfp_flags);
-		if (rc)
+		if (rc) {
+			/* Undo last SDBT. An SDBT with no SDB at its first
+			 * entry but with an SDBT entry instead can not be
+			 * handled by the interrupt handler code.
+			 * Avoid this situation.
+			 */
+			if (tail_prev) {
+				sfb->num_sdbt--;
+				free_page((unsigned long) new);
+				tail = tail_prev;
+			}
 			break;
+		}
 		sfb->num_sdb++;
 		tail++;
+		tail_prev = new = NULL;	/* Allocated at least one SBD */
 	}
 
 	/* Link sampling buffer to its origin */
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/sh/include/cpu-sh4/cpu/sh7734.h linux-libre-4.4.208-gnu/arch/sh/include/cpu-sh4/cpu/sh7734.h
--- linux-libre-4.4.207-gnu/arch/sh/include/cpu-sh4/cpu/sh7734.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/sh/include/cpu-sh4/cpu/sh7734.h	2020-01-04 07:34:38.000000000 -0500
@@ -133,7 +133,7 @@ enum {
 	GPIO_FN_EX_WAIT1, GPIO_FN_SD1_DAT0_A, GPIO_FN_DREQ2, GPIO_FN_CAN1_TX_C,
 		GPIO_FN_ET0_LINK_C, GPIO_FN_ET0_ETXD5_A,
 	GPIO_FN_EX_WAIT0, GPIO_FN_TCLK1_B,
-	GPIO_FN_RD_WR, GPIO_FN_TCLK0,
+	GPIO_FN_RD_WR, GPIO_FN_TCLK0, GPIO_FN_CAN_CLK_B, GPIO_FN_ET0_ETXD4,
 	GPIO_FN_EX_CS5, GPIO_FN_SD1_CMD_A, GPIO_FN_ATADIR, GPIO_FN_QSSL_B,
 		GPIO_FN_ET0_ETXD3_A,
 	GPIO_FN_EX_CS4, GPIO_FN_SD1_WP_A, GPIO_FN_ATAWR, GPIO_FN_QMI_QIO1_B,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/x86/include/asm/crash.h linux-libre-4.4.208-gnu/arch/x86/include/asm/crash.h
--- linux-libre-4.4.207-gnu/arch/x86/include/asm/crash.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/x86/include/asm/crash.h	2020-01-04 07:34:38.000000000 -0500
@@ -1,6 +1,8 @@
 #ifndef _ASM_X86_CRASH_H
 #define _ASM_X86_CRASH_H
 
+struct kimage;
+
 int crash_load_segments(struct kimage *image);
 int crash_copy_backup_region(struct kimage *image);
 int crash_setup_memmap_entries(struct kimage *image,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/x86/include/asm/fixmap.h linux-libre-4.4.208-gnu/arch/x86/include/asm/fixmap.h
--- linux-libre-4.4.207-gnu/arch/x86/include/asm/fixmap.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/x86/include/asm/fixmap.h	2020-01-04 07:34:38.000000000 -0500
@@ -147,7 +147,7 @@ extern pgprot_t kmap_prot;
 extern pte_t *pkmap_page_table;
 
 void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
-void native_set_fixmap(enum fixed_addresses idx,
+void native_set_fixmap(unsigned /* enum fixed_addresses */ idx,
 		       phys_addr_t phys, pgprot_t flags);
 
 #ifndef CONFIG_PARAVIRT
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/x86/kernel/apic/io_apic.c linux-libre-4.4.208-gnu/arch/x86/kernel/apic/io_apic.c
--- linux-libre-4.4.207-gnu/arch/x86/kernel/apic/io_apic.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/x86/kernel/apic/io_apic.c	2020-01-04 07:34:38.000000000 -0500
@@ -1710,9 +1710,10 @@ static bool io_apic_level_ack_pending(st
 
 static inline bool ioapic_irqd_mask(struct irq_data *data)
 {
-	/* If we are moving the irq we need to mask it */
+	/* If we are moving the IRQ we need to mask it */
 	if (unlikely(irqd_is_setaffinity_pending(data))) {
-		mask_ioapic_irq(data);
+		if (!irqd_irq_masked(data))
+			mask_ioapic_irq(data);
 		return true;
 	}
 	return false;
@@ -1749,7 +1750,9 @@ static inline void ioapic_irqd_unmask(st
 		 */
 		if (!io_apic_level_ack_pending(data->chip_data))
 			irq_move_masked_irq(data);
-		unmask_ioapic_irq(data);
+		/* If the IRQ is masked in the core, leave it: */
+		if (!irqd_irq_masked(data))
+			unmask_ioapic_irq(data);
 	}
 }
 #else
diff -druNp --no-dereference linux-libre-4.4.207-gnu/arch/x86/mm/pgtable.c linux-libre-4.4.208-gnu/arch/x86/mm/pgtable.c
--- linux-libre-4.4.207-gnu/arch/x86/mm/pgtable.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/arch/x86/mm/pgtable.c	2020-01-04 07:34:38.000000000 -0500
@@ -567,8 +567,8 @@ void __native_set_fixmap(enum fixed_addr
 	fixmaps_set++;
 }
 
-void native_set_fixmap(enum fixed_addresses idx, phys_addr_t phys,
-		       pgprot_t flags)
+void native_set_fixmap(unsigned /* enum fixed_addresses */ idx,
+		       phys_addr_t phys, pgprot_t flags)
 {
 	__native_set_fixmap(idx, pfn_pte(phys >> PAGE_SHIFT, flags));
 }
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/ata/libata-core.c linux-libre-4.4.208-gnu/drivers/ata/libata-core.c
--- linux-libre-4.4.207-gnu/drivers/ata/libata-core.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/ata/libata-core.c	2020-01-04 07:34:38.000000000 -0500
@@ -6355,6 +6355,9 @@ void ata_host_detach(struct ata_host *ho
 {
 	int i;
 
+	/* Ensure ata_port probe has completed */
+	async_synchronize_full();
+
 	for (i = 0; i < host->n_ports; i++)
 		ata_port_detach(host->ports[i]);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/cdrom/cdrom.c linux-libre-4.4.208-gnu/drivers/cdrom/cdrom.c
--- linux-libre-4.4.207-gnu/drivers/cdrom/cdrom.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/cdrom/cdrom.c	2020-01-04 07:34:38.000000000 -0500
@@ -998,6 +998,12 @@ static void cdrom_count_tracks(struct cd
 	tracks->xa = 0;
 	tracks->error = 0;
 	cd_dbg(CD_COUNT_TRACKS, "entering cdrom_count_tracks\n");
+
+	if (!CDROM_CAN(CDC_PLAY_AUDIO)) {
+		tracks->error = CDS_NO_INFO;
+		return;
+	}
+
 	/* Grab the TOC header so we can see how many tracks there are */
 	ret = cdi->ops->audio_ioctl(cdi, CDROMREADTOCHDR, &header);
 	if (ret) {
@@ -1164,7 +1170,8 @@ int cdrom_open(struct cdrom_device_info
 		ret = open_for_data(cdi);
 		if (ret)
 			goto err;
-		cdrom_mmc3_profile(cdi);
+		if (CDROM_CAN(CDC_GENERIC_PACKET))
+			cdrom_mmc3_profile(cdi);
 		if (mode & FMODE_WRITE) {
 			ret = -EROFS;
 			if (cdrom_open_write(cdi))
@@ -2863,6 +2870,9 @@ int cdrom_get_last_written(struct cdrom_
 	   it doesn't give enough information or fails. then we return
 	   the toc contents. */
 use_toc:
+	if (!CDROM_CAN(CDC_PLAY_AUDIO))
+		return -ENOSYS;
+
 	toc.cdte_format = CDROM_MSF;
 	toc.cdte_track = CDROM_LEADOUT;
 	if ((ret = cdi->ops->audio_ioctl(cdi, CDROMREADTOCENTRY, &toc)))
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/char/hw_random/omap3-rom-rng.c linux-libre-4.4.208-gnu/drivers/char/hw_random/omap3-rom-rng.c
--- linux-libre-4.4.207-gnu/drivers/char/hw_random/omap3-rom-rng.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/char/hw_random/omap3-rom-rng.c	2020-01-04 07:34:38.000000000 -0500
@@ -119,7 +119,8 @@ static int omap3_rom_rng_probe(struct pl
 static int omap3_rom_rng_remove(struct platform_device *pdev)
 {
 	hwrng_unregister(&omap3_rom_rng_ops);
-	clk_disable_unprepare(rng_clk);
+	if (!rng_idle)
+		clk_disable_unprepare(rng_clk);
 	return 0;
 }
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/clk/pxa/clk-pxa27x.c linux-libre-4.4.208-gnu/drivers/clk/pxa/clk-pxa27x.c
--- linux-libre-4.4.207-gnu/drivers/clk/pxa/clk-pxa27x.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/clk/pxa/clk-pxa27x.c	2020-01-04 07:34:38.000000000 -0500
@@ -362,6 +362,7 @@ struct dummy_clk {
 };
 static struct dummy_clk dummy_clks[] __initdata = {
 	DUMMY_CLK(NULL, "pxa27x-gpio", "osc_32_768khz"),
+	DUMMY_CLK(NULL, "pxa-rtc", "osc_32_768khz"),
 	DUMMY_CLK(NULL, "sa1100-rtc", "osc_32_768khz"),
 	DUMMY_CLK("UARTCLK", "pxa2xx-ir", "STUART"),
 };
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/clk/qcom/clk-rcg2.c linux-libre-4.4.208-gnu/drivers/clk/qcom/clk-rcg2.c
--- linux-libre-4.4.207-gnu/drivers/clk/qcom/clk-rcg2.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/clk/qcom/clk-rcg2.c	2020-01-04 07:34:38.000000000 -0500
@@ -196,6 +196,8 @@ static int _freq_tbl_determine_rate(stru
 	p = clk_hw_get_parent_by_index(hw, index);
 	if (clk_flags & CLK_SET_RATE_PARENT) {
 		if (f->pre_div) {
+			if (!rate)
+				rate = req->rate;
 			rate /= 2;
 			rate *= f->pre_div + 1;
 		}
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/clk/qcom/common.c linux-libre-4.4.208-gnu/drivers/clk/qcom/common.c
--- linux-libre-4.4.207-gnu/drivers/clk/qcom/common.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/clk/qcom/common.c	2020-01-04 07:34:38.000000000 -0500
@@ -36,6 +36,9 @@ struct freq_tbl *qcom_find_freq(const st
 	if (!f)
 		return NULL;
 
+	if (!f->freq)
+		return f;
+
 	for (; f->freq; f++)
 		if (rate <= f->freq)
 			return f;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/clocksource/asm9260_timer.c linux-libre-4.4.208-gnu/drivers/clocksource/asm9260_timer.c
--- linux-libre-4.4.207-gnu/drivers/clocksource/asm9260_timer.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/clocksource/asm9260_timer.c	2020-01-04 07:34:38.000000000 -0500
@@ -196,6 +196,10 @@ static void __init asm9260_timer_init(st
 		panic("%s: unable to map resource", np->name);
 
 	clk = of_clk_get(np, 0);
+	if (IS_ERR(clk)) {
+		pr_err("Failed to get clk!\n");
+		return PTR_ERR(clk);
+	}
 
 	ret = clk_prepare_enable(clk);
 	if (ret)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/cpufreq/cpufreq.c linux-libre-4.4.208-gnu/drivers/cpufreq/cpufreq.c
--- linux-libre-4.4.207-gnu/drivers/cpufreq/cpufreq.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/cpufreq/cpufreq.c	2020-01-04 07:34:38.000000000 -0500
@@ -2426,6 +2426,13 @@ int cpufreq_register_driver(struct cpufr
 	if (cpufreq_disabled())
 		return -ENODEV;
 
+	/*
+	 * The cpufreq core depends heavily on the availability of device
+	 * structure, make sure they are available before proceeding further.
+	 */
+	if (!get_cpu_device(0))
+		return -EPROBE_DEFER;
+
 	if (!driver_data || !driver_data->verify || !driver_data->init ||
 	    !(driver_data->setpolicy || driver_data->target_index ||
 		    driver_data->target) ||
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c linux-libre-4.4.208-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
--- linux-libre-4.4.207-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/crypto/sunxi-ss/sun4i-ss-hash.c	2020-01-04 07:34:38.000000000 -0500
@@ -245,8 +245,8 @@ int sun4i_hash_update(struct ahash_reque
 			 */
 			while (op->len < 64 && i < end) {
 				/* how many bytes we can read from current SG */
-				in_r = min3(mi.length - in_i, end - i,
-					    64 - op->len);
+				in_r = min(end - i, 64 - op->len);
+				in_r = min_t(size_t, mi.length - in_i, in_r);
 				memcpy(op->buf + op->len, mi.addr + in_i, in_r);
 				op->len += in_r;
 				i += in_r;
@@ -266,8 +266,8 @@ int sun4i_hash_update(struct ahash_reque
 		}
 		if (mi.length - in_i > 3 && i < end) {
 			/* how many bytes we can read from current SG */
-			in_r = min3(mi.length - in_i, areq->nbytes - i,
-				    ((mi.length - in_i) / 4) * 4);
+			in_r = min_t(size_t, mi.length - in_i, areq->nbytes - i);
+			in_r = min_t(size_t, ((mi.length - in_i) / 4) * 4, in_r);
 			/* how many bytes we can write in the device*/
 			todo = min3((u32)(end - i) / 4, rx_cnt, (u32)in_r / 4);
 			writesl(ss->base + SS_RXFIFO, mi.addr + in_i, todo);
@@ -289,8 +289,8 @@ int sun4i_hash_update(struct ahash_reque
 	if ((areq->nbytes - i) < 64) {
 		while (i < areq->nbytes && in_i < mi.length && op->len < 64) {
 			/* how many bytes we can read from current SG */
-			in_r = min3(mi.length - in_i, areq->nbytes - i,
-				    64 - op->len);
+			in_r = min(areq->nbytes - i, 64 - op->len);
+			in_r = min_t(size_t, mi.length - in_i, in_r);
 			memcpy(op->buf + op->len, mi.addr + in_i, in_r);
 			op->len += in_r;
 			i += in_r;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/crypto/vmx/Makefile linux-libre-4.4.208-gnu/drivers/crypto/vmx/Makefile
--- linux-libre-4.4.207-gnu/drivers/crypto/vmx/Makefile	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/crypto/vmx/Makefile	2020-01-04 07:34:38.000000000 -0500
@@ -2,13 +2,13 @@ obj-$(CONFIG_CRYPTO_DEV_VMX_ENCRYPT) +=
 vmx-crypto-objs := vmx.o aesp8-ppc.o ghashp8-ppc.o aes.o aes_cbc.o aes_ctr.o ghash.o
 
 ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)
-TARGET := linux-ppc64le
+override flavour := linux-ppc64le
 else
-TARGET := linux-ppc64
+override flavour := linux-ppc64
 endif
 
 quiet_cmd_perl = PERL $@
-      cmd_perl = $(PERL) $(<) $(TARGET) > $(@)
+      cmd_perl = $(PERL) $(<) $(flavour) > $(@)
 
 $(src)/aesp8-ppc.S: $(src)/aesp8-ppc.pl
 	$(call cmd,perl)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/edac/ghes_edac.c linux-libre-4.4.208-gnu/drivers/edac/ghes_edac.c
--- linux-libre-4.4.207-gnu/drivers/edac/ghes_edac.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/edac/ghes_edac.c	2020-01-04 07:34:38.000000000 -0500
@@ -189,6 +189,7 @@ void ghes_edac_report_mem_error(struct g
 	/* Cleans the error report buffer */
 	memset(e, 0, sizeof (*e));
 	e->error_count = 1;
+	e->grain = 1;
 	strcpy(e->label, "unknown label");
 	e->msg = pvt->msg;
 	e->other_detail = pvt->other_detail;
@@ -284,7 +285,7 @@ void ghes_edac_report_mem_error(struct g
 
 	/* Error grain */
 	if (mem_err->validation_bits & CPER_MEM_VALID_PA_MASK)
-		e->grain = ~(mem_err->physical_addr_mask & ~PAGE_MASK);
+		e->grain = ~mem_err->physical_addr_mask + 1;
 
 	/* Memory error location, mapped on e->location */
 	p = e->location;
@@ -391,8 +392,13 @@ void ghes_edac_report_mem_error(struct g
 	if (p > pvt->other_detail)
 		*(p - 1) = '\0';
 
+	/* Sanity-check driver-supplied grain value. */
+	if (WARN_ON_ONCE(!e->grain))
+		e->grain = 1;
+
+	grain_bits = fls_long(e->grain - 1);
+
 	/* Generate the trace event */
-	grain_bits = fls_long(e->grain);
 	snprintf(pvt->detail_location, sizeof(pvt->detail_location),
 		 "APEI location: %s %s", e->location, e->other_detail);
 	trace_mc_event(type, e->msg, e->label, e->error_count,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/extcon/extcon-sm5502.c linux-libre-4.4.208-gnu/drivers/extcon/extcon-sm5502.c
--- linux-libre-4.4.207-gnu/drivers/extcon/extcon-sm5502.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/extcon/extcon-sm5502.c	2020-01-04 07:34:38.000000000 -0500
@@ -69,6 +69,10 @@ struct sm5502_muic_info {
 /* Default value of SM5502 register to bring up MUIC device. */
 static struct reg_data sm5502_reg_data[] = {
 	{
+		.reg = SM5502_REG_RESET,
+		.val = SM5502_REG_RESET_MASK,
+		.invert = true,
+	}, {
 		.reg = SM5502_REG_CONTROL,
 		.val = SM5502_REG_CONTROL_MASK_INT_MASK,
 		.invert = false,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/extcon/extcon-sm5502.h linux-libre-4.4.208-gnu/drivers/extcon/extcon-sm5502.h
--- linux-libre-4.4.207-gnu/drivers/extcon/extcon-sm5502.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/extcon/extcon-sm5502.h	2020-01-04 07:34:38.000000000 -0500
@@ -241,6 +241,8 @@ enum sm5502_reg {
 #define DM_DP_SWITCH_UART			((DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DP_SHIFT) \
 						| (DM_DP_CON_SWITCH_UART <<SM5502_REG_MANUAL_SW1_DM_SHIFT))
 
+#define SM5502_REG_RESET_MASK			(0x1)
+
 /* SM5502 Interrupts */
 enum sm5502_irq {
 	/* INT1 */
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/gpio/gpio-mpc8xxx.c linux-libre-4.4.208-gnu/drivers/gpio/gpio-mpc8xxx.c
--- linux-libre-4.4.207-gnu/drivers/gpio/gpio-mpc8xxx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/gpio/gpio-mpc8xxx.c	2020-01-04 07:34:38.000000000 -0500
@@ -409,7 +409,8 @@ static int mpc8xxx_probe(struct platform
 	 * It's assumed that only a single type of gpio controller is available
 	 * on the current machine, so overwriting global data is fine.
 	 */
-	mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type;
+	if (devtype->irq_set_type)
+		mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type;
 
 	gc->direction_output = devtype->gpio_dir_out ?: mpc8xxx_gpio_dir_out;
 	gc->get = devtype->gpio_get ?: mpc8xxx_gpio_get;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/gpu/drm/gma500/oaktrail_crtc.c linux-libre-4.4.208-gnu/drivers/gpu/drm/gma500/oaktrail_crtc.c
--- linux-libre-4.4.207-gnu/drivers/gpu/drm/gma500/oaktrail_crtc.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/gpu/drm/gma500/oaktrail_crtc.c	2020-01-04 07:34:38.000000000 -0500
@@ -139,6 +139,7 @@ static bool mrst_sdvo_find_best_pll(cons
 	s32 freq_error, min_error = 100000;
 
 	memset(best_clock, 0, sizeof(*best_clock));
+	memset(&clock, 0, sizeof(clock));
 
 	for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) {
 		for (clock.n = limit->n.min; clock.n <= limit->n.max;
@@ -195,6 +196,7 @@ static bool mrst_lvds_find_best_pll(cons
 	int err = target;
 
 	memset(best_clock, 0, sizeof(*best_clock));
+	memset(&clock, 0, sizeof(clock));
 
 	for (clock.m = limit->m.min; clock.m <= limit->m.max; clock.m++) {
 		for (clock.p1 = limit->p1.min; clock.p1 <= limit->p1.max;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/hid/hid-core.c linux-libre-4.4.208-gnu/drivers/hid/hid-core.c
--- linux-libre-4.4.207-gnu/drivers/hid/hid-core.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/hid/hid-core.c	2020-01-04 07:34:38.000000000 -0500
@@ -761,6 +761,10 @@ static void hid_scan_feature_usage(struc
 	if (usage == 0xff0000c5 && parser->global.report_count == 256 &&
 	    parser->global.report_size == 8)
 		parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8;
+
+	if (usage == 0xff0000c6 && parser->global.report_count == 1 &&
+	    parser->global.report_size == 8)
+		parser->scan_flags |= HID_SCAN_FLAG_MT_WIN_8;
 }
 
 static void hid_scan_collection(struct hid_parser *parser, unsigned type)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/iio/adc/max1027.c linux-libre-4.4.208-gnu/drivers/iio/adc/max1027.c
--- linux-libre-4.4.207-gnu/drivers/iio/adc/max1027.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/iio/adc/max1027.c	2020-01-04 07:34:38.000000000 -0500
@@ -470,6 +470,14 @@ static int max1027_probe(struct spi_devi
 		goto fail_dev_register;
 	}
 
+	/* Internal reset */
+	st->reg = MAX1027_RST_REG;
+	ret = spi_write(st->spi, &st->reg, 1);
+	if (ret < 0) {
+		dev_err(&indio_dev->dev, "Failed to reset the ADC\n");
+		return ret;
+	}
+
 	/* Disable averaging */
 	st->reg = MAX1027_AVG_REG;
 	ret = spi_write(st->spi, &st->reg, 1);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/iio/light/bh1750.c linux-libre-4.4.208-gnu/drivers/iio/light/bh1750.c
--- linux-libre-4.4.207-gnu/drivers/iio/light/bh1750.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/iio/light/bh1750.c	2020-01-04 07:34:38.000000000 -0500
@@ -62,9 +62,9 @@ struct bh1750_chip_info {
 
 	u16 int_time_low_mask;
 	u16 int_time_high_mask;
-}
+};
 
-static const bh1750_chip_info_tbl[] = {
+static const struct bh1750_chip_info bh1750_chip_info_tbl[] = {
 	[BH1710] = { 140, 1022, 300, 400,  250000000, 2, 0x001F, 0x03E0 },
 	[BH1721] = { 140, 1020, 300, 400,  250000000, 2, 0x0010, 0x03E0 },
 	[BH1750] = { 31,  254,  69,  1740, 57500000,  1, 0x001F, 0x00E0 },
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/infiniband/ulp/iser/iscsi_iser.c linux-libre-4.4.208-gnu/drivers/infiniband/ulp/iser/iscsi_iser.c
--- linux-libre-4.4.207-gnu/drivers/infiniband/ulp/iser/iscsi_iser.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/infiniband/ulp/iser/iscsi_iser.c	2020-01-04 07:34:38.000000000 -0500
@@ -646,6 +646,7 @@ iscsi_iser_session_create(struct iscsi_e
 		if (ib_conn->pi_support) {
 			u32 sig_caps = ib_conn->device->dev_attr.sig_prot_cap;
 
+			shost->sg_prot_tablesize = shost->sg_tablesize;
 			scsi_host_set_prot(shost, iser_dif_prot_caps(sig_caps));
 			scsi_host_set_guard(shost, SHOST_DIX_GUARD_IP |
 						   SHOST_DIX_GUARD_CRC);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/input/touchscreen/atmel_mxt_ts.c linux-libre-4.4.208-gnu/drivers/input/touchscreen/atmel_mxt_ts.c
--- linux-libre-4.4.207-gnu/drivers/input/touchscreen/atmel_mxt_ts.c	2019-12-22 02:14:40.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/input/touchscreen/atmel_mxt_ts.c	2020-01-04 12:49:33.000000000 -0500
@@ -2700,6 +2700,8 @@ static int __maybe_unused mxt_suspend(st
 
 	mutex_unlock(&input_dev->mutex);
 
+	disable_irq(data->irq);
+
 	return 0;
 }
 
@@ -2712,6 +2714,8 @@ static int __maybe_unused mxt_resume(str
 	if (!input_dev)
 		return 0;
 
+	enable_irq(data->irq);
+
 	mutex_lock(&input_dev->mutex);
 
 	if (input_dev->users)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/iommu/tegra-smmu.c linux-libre-4.4.208-gnu/drivers/iommu/tegra-smmu.c
--- linux-libre-4.4.207-gnu/drivers/iommu/tegra-smmu.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/iommu/tegra-smmu.c	2020-01-04 07:34:38.000000000 -0500
@@ -153,9 +153,9 @@ static bool smmu_dma_addr_valid(struct t
 	return (addr & smmu->pfn_mask) == addr;
 }
 
-static dma_addr_t smmu_pde_to_dma(u32 pde)
+static dma_addr_t smmu_pde_to_dma(struct tegra_smmu *smmu, u32 pde)
 {
-	return pde << 12;
+	return (dma_addr_t)(pde & smmu->pfn_mask) << 12;
 }
 
 static void smmu_flush_ptc_all(struct tegra_smmu *smmu)
@@ -540,6 +540,7 @@ static u32 *tegra_smmu_pte_lookup(struct
 				  dma_addr_t *dmap)
 {
 	unsigned int pd_index = iova_pd_index(iova);
+	struct tegra_smmu *smmu = as->smmu;
 	struct page *pt_page;
 	u32 *pd;
 
@@ -548,7 +549,7 @@ static u32 *tegra_smmu_pte_lookup(struct
 		return NULL;
 
 	pd = page_address(as->pd);
-	*dmap = smmu_pde_to_dma(pd[pd_index]);
+	*dmap = smmu_pde_to_dma(smmu, pd[pd_index]);
 
 	return tegra_smmu_pte_offset(pt_page, iova);
 }
@@ -590,7 +591,7 @@ static u32 *as_get_pte(struct tegra_smmu
 	} else {
 		u32 *pd = page_address(as->pd);
 
-		*dmap = smmu_pde_to_dma(pd[pde]);
+		*dmap = smmu_pde_to_dma(smmu, pd[pde]);
 	}
 
 	return tegra_smmu_pte_offset(as->pts[pde], iova);
@@ -615,7 +616,7 @@ static void tegra_smmu_pte_put_use(struc
 	if (--as->count[pde] == 0) {
 		struct tegra_smmu *smmu = as->smmu;
 		u32 *pd = page_address(as->pd);
-		dma_addr_t pte_dma = smmu_pde_to_dma(pd[pde]);
+		dma_addr_t pte_dma = smmu_pde_to_dma(smmu, pd[pde]);
 
 		tegra_smmu_set_pde(as, iova, 0);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/irqchip/irq-bcm7038-l1.c linux-libre-4.4.208-gnu/drivers/irqchip/irq-bcm7038-l1.c
--- linux-libre-4.4.207-gnu/drivers/irqchip/irq-bcm7038-l1.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/irqchip/irq-bcm7038-l1.c	2020-01-04 07:34:38.000000000 -0500
@@ -283,6 +283,10 @@ static int __init bcm7038_l1_init_one(st
 		pr_err("failed to map parent interrupt %d\n", parent_irq);
 		return -EINVAL;
 	}
+
+	if (of_property_read_bool(dn, "brcm,irq-can-wake"))
+		enable_irq_wake(parent_irq);
+
 	irq_set_chained_handler_and_data(parent_irq, bcm7038_l1_irq_handle,
 					 intc);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/irqchip/irq-ingenic.c linux-libre-4.4.208-gnu/drivers/irqchip/irq-ingenic.c
--- linux-libre-4.4.207-gnu/drivers/irqchip/irq-ingenic.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/irqchip/irq-ingenic.c	2020-01-04 07:34:38.000000000 -0500
@@ -117,6 +117,14 @@ static int __init ingenic_intc_of_init(s
 		goto out_unmap_irq;
 	}
 
+	domain = irq_domain_add_legacy(node, num_chips * 32,
+				       JZ4740_IRQ_BASE, 0,
+				       &irq_domain_simple_ops, NULL);
+	if (!domain) {
+		err = -ENOMEM;
+		goto out_unmap_base;
+	}
+
 	for (i = 0; i < num_chips; i++) {
 		/* Mask all irqs */
 		writel(0xffffffff, intc->base + (i * CHIP_SIZE) +
@@ -143,14 +151,11 @@ static int __init ingenic_intc_of_init(s
 				       IRQ_NOPROBE | IRQ_LEVEL);
 	}
 
-	domain = irq_domain_add_legacy(node, num_chips * 32, JZ4740_IRQ_BASE, 0,
-				       &irq_domain_simple_ops, NULL);
-	if (!domain)
-		pr_warn("unable to register IRQ domain\n");
-
 	setup_irq(parent_irq, &intc_cascade_action);
 	return 0;
 
+out_unmap_base:
+	iounmap(intc->base);
 out_unmap_irq:
 	irq_dispose_mapping(parent_irq);
 out_free:
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/md/bcache/btree.c linux-libre-4.4.208-gnu/drivers/md/bcache/btree.c
--- linux-libre-4.4.207-gnu/drivers/md/bcache/btree.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/md/bcache/btree.c	2020-01-04 07:34:38.000000000 -0500
@@ -686,6 +686,8 @@ static unsigned long bch_mca_scan(struct
 	 * IO can always make forward progress:
 	 */
 	nr /= c->btree_pages;
+	if (nr == 0)
+		nr = 1;
 	nr = min_t(unsigned long, nr, mca_can_free(c));
 
 	i = 0;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/i2c/ov2659.c linux-libre-4.4.208-gnu/drivers/media/i2c/ov2659.c
--- linux-libre-4.4.207-gnu/drivers/media/i2c/ov2659.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/i2c/ov2659.c	2020-01-04 07:34:38.000000000 -0500
@@ -419,10 +419,14 @@ static struct sensor_register ov2659_720
 	{ REG_TIMING_YINC, 0x11 },
 	{ REG_TIMING_VERT_FORMAT, 0x80 },
 	{ REG_TIMING_HORIZ_FORMAT, 0x00 },
+	{ 0x370a, 0x12 },
 	{ 0x3a03, 0xe8 },
 	{ 0x3a09, 0x6f },
 	{ 0x3a0b, 0x5d },
 	{ 0x3a15, 0x9a },
+	{ REG_VFIFO_READ_START_H, 0x00 },
+	{ REG_VFIFO_READ_START_L, 0x80 },
+	{ REG_ISP_CTRL02, 0x00 },
 	{ REG_NULL, 0x00 },
 };
 
@@ -1204,11 +1208,15 @@ static int ov2659_s_stream(struct v4l2_s
 		goto unlock;
 	}
 
-	ov2659_set_pixel_clock(ov2659);
-	ov2659_set_frame_size(ov2659);
-	ov2659_set_format(ov2659);
-	ov2659_set_streaming(ov2659, 1);
-	ov2659->streaming = on;
+	ret = ov2659_set_pixel_clock(ov2659);
+	if (!ret)
+		ret = ov2659_set_frame_size(ov2659);
+	if (!ret)
+		ret = ov2659_set_format(ov2659);
+	if (!ret) {
+		ov2659_set_streaming(ov2659, 1);
+		ov2659->streaming = on;
+	}
 
 unlock:
 	mutex_unlock(&ov2659->lock);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/i2c/soc_camera/ov6650.c linux-libre-4.4.208-gnu/drivers/media/i2c/soc_camera/ov6650.c
--- linux-libre-4.4.207-gnu/drivers/media/i2c/soc_camera/ov6650.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/i2c/soc_camera/ov6650.c	2020-01-04 07:34:38.000000000 -0500
@@ -611,7 +611,6 @@ static int ov6650_s_fmt(struct v4l2_subd
 		dev_err(&client->dev, "Pixel format not handled: 0x%x\n", code);
 		return -EINVAL;
 	}
-	priv->code = code;
 
 	if (code == MEDIA_BUS_FMT_Y8_1X8 ||
 			code == MEDIA_BUS_FMT_SBGGR8_1X8) {
@@ -637,7 +636,6 @@ static int ov6650_s_fmt(struct v4l2_subd
 		dev_dbg(&client->dev, "max resolution: CIF\n");
 		coma_mask |= COMA_QCIF;
 	}
-	priv->half_scale = half_scale;
 
 	if (sense) {
 		if (sense->master_clock == 8000000) {
@@ -677,8 +675,13 @@ static int ov6650_s_fmt(struct v4l2_subd
 		ret = ov6650_reg_rmw(client, REG_COMA, coma_set, coma_mask);
 	if (!ret)
 		ret = ov6650_reg_write(client, REG_CLKRC, clkrc);
-	if (!ret)
+	if (!ret) {
+		priv->half_scale = half_scale;
+
 		ret = ov6650_reg_rmw(client, REG_COML, coml_set, coml_mask);
+	}
+	if (!ret)
+		priv->code = code;
 
 	if (!ret) {
 		mf->colorspace	= priv->colorspace;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/platform/am437x/am437x-vpfe.c linux-libre-4.4.208-gnu/drivers/media/platform/am437x/am437x-vpfe.c
--- linux-libre-4.4.207-gnu/drivers/media/platform/am437x/am437x-vpfe.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/platform/am437x/am437x-vpfe.c	2020-01-04 07:34:38.000000000 -0500
@@ -1847,6 +1847,10 @@ static int vpfe_s_std(struct file *file,
 	if (!(sdinfo->inputs[0].capabilities & V4L2_IN_CAP_STD))
 		return -ENODATA;
 
+	/* if trying to set the same std then nothing to do */
+	if (vpfe_standards[vpfe->std_index].std_id == std_id)
+		return 0;
+
 	/* If streaming is started, return error */
 	if (vb2_is_busy(&vpfe->buffer_queue)) {
 		vpfe_err(vpfe, "%s device busy\n", __func__);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/platform/ti-vpe/vpe.c linux-libre-4.4.208-gnu/drivers/media/platform/ti-vpe/vpe.c
--- linux-libre-4.4.207-gnu/drivers/media/platform/ti-vpe/vpe.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/platform/ti-vpe/vpe.c	2020-01-04 07:34:38.000000000 -0500
@@ -330,20 +330,25 @@ enum {
 };
 
 /* find our format description corresponding to the passed v4l2_format */
-static struct vpe_fmt *find_format(struct v4l2_format *f)
+static struct vpe_fmt *__find_format(u32 fourcc)
 {
 	struct vpe_fmt *fmt;
 	unsigned int k;
 
 	for (k = 0; k < ARRAY_SIZE(vpe_formats); k++) {
 		fmt = &vpe_formats[k];
-		if (fmt->fourcc == f->fmt.pix.pixelformat)
+		if (fmt->fourcc == fourcc)
 			return fmt;
 	}
 
 	return NULL;
 }
 
+static struct vpe_fmt *find_format(struct v4l2_format *f)
+{
+	return __find_format(f->fmt.pix.pixelformat);
+}
+
 /*
  * there is one vpe_dev structure in the driver, it is shared by
  * all instances.
@@ -1294,6 +1299,7 @@ static irqreturn_t vpe_irq(int irq_vpe,
 		d_vb->timecode = s_vb->timecode;
 
 	d_vb->sequence = ctx->sequence;
+	s_vb->sequence = ctx->sequence;
 
 	d_q_data = &ctx->q_data[Q_DATA_DST];
 	if (d_q_data->flags & Q_DATA_INTERLACED) {
@@ -1434,9 +1440,9 @@ static int __vpe_try_fmt(struct vpe_ctx
 	int i, depth, depth_bytes;
 
 	if (!fmt || !(fmt->types & type)) {
-		vpe_err(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
+		vpe_dbg(ctx->dev, "Fourcc format (0x%08x) invalid.\n",
 			pix->pixelformat);
-		return -EINVAL;
+		fmt = __find_format(V4L2_PIX_FMT_YUYV);
 	}
 
 	if (pix->field != V4L2_FIELD_NONE && pix->field != V4L2_FIELD_ALTERNATE)
@@ -1994,7 +2000,7 @@ static int vpe_open(struct file *file)
 	v4l2_ctrl_handler_setup(hdl);
 
 	s_q_data = &ctx->q_data[Q_DATA_SRC];
-	s_q_data->fmt = &vpe_formats[2];
+	s_q_data->fmt = __find_format(V4L2_PIX_FMT_YUYV);
 	s_q_data->width = 1920;
 	s_q_data->height = 1080;
 	s_q_data->bytesperline[VPE_LUMA] = (s_q_data->width *
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/radio/si470x/radio-si470x-i2c.c linux-libre-4.4.208-gnu/drivers/media/radio/si470x/radio-si470x-i2c.c
--- linux-libre-4.4.207-gnu/drivers/media/radio/si470x/radio-si470x-i2c.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/radio/si470x/radio-si470x-i2c.c	2020-01-04 07:34:38.000000000 -0500
@@ -460,6 +460,8 @@ static int si470x_i2c_remove(struct i2c_
 	video_unregister_device(&radio->videodev);
 	kfree(radio);
 
+	v4l2_ctrl_handler_free(&radio->hdl);
+	v4l2_device_unregister(&radio->v4l2_dev);
 	return 0;
 }
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/usb/b2c2/flexcop-usb.c linux-libre-4.4.208-gnu/drivers/media/usb/b2c2/flexcop-usb.c
--- linux-libre-4.4.207-gnu/drivers/media/usb/b2c2/flexcop-usb.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/usb/b2c2/flexcop-usb.c	2020-01-04 07:34:38.000000000 -0500
@@ -474,7 +474,13 @@ urb_error:
 static int flexcop_usb_init(struct flexcop_usb *fc_usb)
 {
 	/* use the alternate setting with the larges buffer */
-	usb_set_interface(fc_usb->udev,0,1);
+	int ret = usb_set_interface(fc_usb->udev, 0, 1);
+
+	if (ret) {
+		err("set interface failed.");
+		return ret;
+	}
+
 	switch (fc_usb->udev->speed) {
 	case USB_SPEED_LOW:
 		err("cannot handle USB speed because it is too slow.");
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c linux-libre-4.4.208-gnu/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
--- linux-libre-4.4.207-gnu/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c	2020-01-04 07:34:38.000000000 -0500
@@ -886,8 +886,12 @@ static void pvr2_v4l2_internal_check(str
 	pvr2_v4l2_dev_disassociate_parent(vp->dev_video);
 	pvr2_v4l2_dev_disassociate_parent(vp->dev_radio);
 	if (!list_empty(&vp->dev_video->devbase.fh_list) ||
-	    !list_empty(&vp->dev_radio->devbase.fh_list))
+	    (vp->dev_radio &&
+	     !list_empty(&vp->dev_radio->devbase.fh_list))) {
+		pvr2_trace(PVR2_TRACE_STRUCT,
+			   "pvr2_v4l2 internal_check exit-empty id=%p", vp);
 		return;
+	}
 	pvr2_v4l2_destroy_no_lock(vp);
 }
 
@@ -961,7 +965,8 @@ static int pvr2_v4l2_release(struct file
 	kfree(fhp);
 	if (vp->channel.mc_head->disconnect_flag &&
 	    list_empty(&vp->dev_video->devbase.fh_list) &&
-	    list_empty(&vp->dev_radio->devbase.fh_list)) {
+	    (!vp->dev_radio ||
+	     list_empty(&vp->dev_radio->devbase.fh_list))) {
 		pvr2_v4l2_destroy_no_lock(vp);
 	}
 	return 0;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/mmc/host/sdhci.c linux-libre-4.4.208-gnu/drivers/mmc/host/sdhci.c
--- linux-libre-4.4.207-gnu/drivers/mmc/host/sdhci.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/mmc/host/sdhci.c	2020-01-04 07:34:38.000000000 -0500
@@ -1452,9 +1452,7 @@ void sdhci_set_uhs_signaling(struct sdhc
 		ctrl_2 |= SDHCI_CTRL_UHS_SDR104;
 	else if (timing == MMC_TIMING_UHS_SDR12)
 		ctrl_2 |= SDHCI_CTRL_UHS_SDR12;
-	else if (timing == MMC_TIMING_SD_HS ||
-		 timing == MMC_TIMING_MMC_HS ||
-		 timing == MMC_TIMING_UHS_SDR25)
+	else if (timing == MMC_TIMING_UHS_SDR25)
 		ctrl_2 |= SDHCI_CTRL_UHS_SDR25;
 	else if (timing == MMC_TIMING_UHS_SDR50)
 		ctrl_2 |= SDHCI_CTRL_UHS_SDR50;
@@ -2035,7 +2033,7 @@ static int sdhci_execute_tuning(struct m
 		spin_lock_irqsave(&host->lock, flags);
 
 		if (!host->tuning_done) {
-			pr_info(DRIVER_NAME ": Timeout waiting for "
+			pr_debug(DRIVER_NAME ": Timeout waiting for "
 				"Buffer Read Ready interrupt during tuning "
 				"procedure, falling back to fixed sampling "
 				"clock\n");
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/mmc/host/sdhci-of-esdhc.c linux-libre-4.4.208-gnu/drivers/mmc/host/sdhci-of-esdhc.c
--- linux-libre-4.4.207-gnu/drivers/mmc/host/sdhci-of-esdhc.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/mmc/host/sdhci-of-esdhc.c	2020-01-04 07:34:38.000000000 -0500
@@ -625,8 +625,8 @@ static int sdhci_esdhc_probe(struct plat
 		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;
+		host->quirks |= SDHCI_QUIRK_RESET_AFTER_REQUEST;
+		host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 	}
 
 	if (of_device_is_compatible(np, "fsl,p5040-esdhc") ||
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c linux-libre-4.4.208-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
--- linux-libre-4.4.207-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c	2020-01-04 07:34:38.000000000 -0500
@@ -2384,15 +2384,21 @@ static int bnx2x_set_pf_tx_switching(str
 	/* send the ramrod on all the queues of the PF */
 	for_each_eth_queue(bp, i) {
 		struct bnx2x_fastpath *fp = &bp->fp[i];
+		int tx_idx;
 
 		/* Set the appropriate Queue object */
 		q_params.q_obj = &bnx2x_sp_obj(bp, fp).q_obj;
 
-		/* Update the Queue state */
-		rc = bnx2x_queue_state_change(bp, &q_params);
-		if (rc) {
-			BNX2X_ERR("Failed to configure Tx switching\n");
-			return rc;
+		for (tx_idx = FIRST_TX_COS_INDEX;
+		     tx_idx < fp->max_cos; tx_idx++) {
+			q_params.params.update.cid_index = tx_idx;
+
+			/* Update the Queue state */
+			rc = bnx2x_queue_state_change(bp, &q_params);
+			if (rc) {
+				BNX2X_ERR("Failed to configure Tx switching\n");
+				return rc;
+			}
 		}
 	}
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/ethernet/hisilicon/hip04_eth.c linux-libre-4.4.208-gnu/drivers/net/ethernet/hisilicon/hip04_eth.c
--- linux-libre-4.4.207-gnu/drivers/net/ethernet/hisilicon/hip04_eth.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/ethernet/hisilicon/hip04_eth.c	2020-01-04 07:34:38.000000000 -0500
@@ -455,9 +455,9 @@ static int hip04_mac_start_xmit(struct s
 	skb_tx_timestamp(skb);
 
 	hip04_set_xmit_desc(priv, phys);
-	priv->tx_head = TX_NEXT(tx_head);
 	count++;
 	netdev_sent_queue(ndev, skb->len);
+	priv->tx_head = TX_NEXT(tx_head);
 
 	stats->tx_bytes += skb->len;
 	stats->tx_packets++;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/ethernet/qlogic/qla3xxx.c linux-libre-4.4.208-gnu/drivers/net/ethernet/qlogic/qla3xxx.c
--- linux-libre-4.4.207-gnu/drivers/net/ethernet/qlogic/qla3xxx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/ethernet/qlogic/qla3xxx.c	2020-01-04 07:34:38.000000000 -0500
@@ -2752,6 +2752,9 @@ static int ql_alloc_large_buffers(struct
 	int err;
 
 	for (i = 0; i < qdev->num_large_buffers; i++) {
+		lrg_buf_cb = &qdev->lrg_buf[i];
+		memset(lrg_buf_cb, 0, sizeof(struct ql_rcv_buf_cb));
+
 		skb = netdev_alloc_skb(qdev->ndev,
 				       qdev->lrg_buffer_len);
 		if (unlikely(!skb)) {
@@ -2762,11 +2765,7 @@ static int ql_alloc_large_buffers(struct
 			ql_free_large_buffers(qdev);
 			return -ENOMEM;
 		} else {
-
-			lrg_buf_cb = &qdev->lrg_buf[i];
-			memset(lrg_buf_cb, 0, sizeof(struct ql_rcv_buf_cb));
 			lrg_buf_cb->index = i;
-			lrg_buf_cb->skb = skb;
 			/*
 			 * We save some space to copy the ethhdr from first
 			 * buffer
@@ -2788,6 +2787,7 @@ static int ql_alloc_large_buffers(struct
 				return -ENOMEM;
 			}
 
+			lrg_buf_cb->skb = skb;
 			dma_unmap_addr_set(lrg_buf_cb, mapaddr, map);
 			dma_unmap_len_set(lrg_buf_cb, maplen,
 					  qdev->lrg_buffer_len -
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/ethernet/ti/davinci_cpdma.c linux-libre-4.4.208-gnu/drivers/net/ethernet/ti/davinci_cpdma.c
--- linux-libre-4.4.207-gnu/drivers/net/ethernet/ti/davinci_cpdma.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/ethernet/ti/davinci_cpdma.c	2020-01-04 07:34:38.000000000 -0500
@@ -82,7 +82,7 @@ struct cpdma_desc {
 
 struct cpdma_desc_pool {
 	phys_addr_t		phys;
-	u32			hw_addr;
+	dma_addr_t		hw_addr;
 	void __iomem		*iomap;		/* ioremap map */
 	void			*cpumap;	/* dma_alloc map */
 	int			desc_size, mem_size;
@@ -152,7 +152,7 @@ struct cpdma_chan {
  * abstract out these details
  */
 static struct cpdma_desc_pool *
-cpdma_desc_pool_create(struct device *dev, u32 phys, u32 hw_addr,
+cpdma_desc_pool_create(struct device *dev, u32 phys, dma_addr_t hw_addr,
 				int size, int align)
 {
 	int bitmap_size;
@@ -176,13 +176,13 @@ cpdma_desc_pool_create(struct device *de
 
 	if (phys) {
 		pool->phys  = phys;
-		pool->iomap = ioremap(phys, size);
+		pool->iomap = ioremap(phys, size); /* should be memremap? */
 		pool->hw_addr = hw_addr;
 	} else {
-		pool->cpumap = dma_alloc_coherent(dev, size, &pool->phys,
+		pool->cpumap = dma_alloc_coherent(dev, size, &pool->hw_addr,
 						  GFP_KERNEL);
-		pool->iomap = pool->cpumap;
-		pool->hw_addr = pool->phys;
+		pool->iomap = (void __iomem __force *)pool->cpumap;
+		pool->phys = pool->hw_addr; /* assumes no IOMMU, don't use this value */
 	}
 
 	if (pool->iomap)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/fjes/fjes_main.c linux-libre-4.4.208-gnu/drivers/net/fjes/fjes_main.c
--- linux-libre-4.4.207-gnu/drivers/net/fjes/fjes_main.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/fjes/fjes_main.c	2020-01-04 07:34:38.000000000 -0500
@@ -149,6 +149,9 @@ static int fjes_acpi_add(struct acpi_dev
 	/* create platform_device */
 	plat_dev = platform_device_register_simple(DRV_NAME, 0, fjes_resource,
 						   ARRAY_SIZE(fjes_resource));
+	if (IS_ERR(plat_dev))
+		return PTR_ERR(plat_dev);
+
 	device->driver_data = plat_dev;
 
 	return 0;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/hamradio/6pack.c linux-libre-4.4.208-gnu/drivers/net/hamradio/6pack.c
--- linux-libre-4.4.207-gnu/drivers/net/hamradio/6pack.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/hamradio/6pack.c	2020-01-04 07:34:38.000000000 -0500
@@ -669,10 +669,10 @@ static void sixpack_close(struct tty_str
 {
 	struct sixpack *sp;
 
-	write_lock_bh(&disc_data_lock);
+	write_lock_irq(&disc_data_lock);
 	sp = tty->disc_data;
 	tty->disc_data = NULL;
-	write_unlock_bh(&disc_data_lock);
+	write_unlock_irq(&disc_data_lock);
 	if (!sp)
 		return;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/hamradio/mkiss.c linux-libre-4.4.208-gnu/drivers/net/hamradio/mkiss.c
--- linux-libre-4.4.207-gnu/drivers/net/hamradio/mkiss.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/hamradio/mkiss.c	2020-01-04 07:34:38.000000000 -0500
@@ -783,10 +783,10 @@ static void mkiss_close(struct tty_struc
 {
 	struct mkiss *ax;
 
-	write_lock_bh(&disc_data_lock);
+	write_lock_irq(&disc_data_lock);
 	ax = tty->disc_data;
 	tty->disc_data = NULL;
-	write_unlock_bh(&disc_data_lock);
+	write_unlock_irq(&disc_data_lock);
 
 	if (!ax)
 		return;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/phy/phy_device.c linux-libre-4.4.208-gnu/drivers/net/phy/phy_device.c
--- linux-libre-4.4.207-gnu/drivers/net/phy/phy_device.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/phy/phy_device.c	2020-01-04 07:34:38.000000000 -0500
@@ -161,8 +161,8 @@ struct phy_device *phy_device_create(str
 
 	dev->dev.release = phy_device_release;
 
-	dev->speed = 0;
-	dev->duplex = -1;
+	dev->speed = SPEED_UNKNOWN;
+	dev->duplex = DUPLEX_UNKNOWN;
 	dev->pause = 0;
 	dev->asym_pause = 0;
 	dev->link = 1;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/usb/lan78xx.c linux-libre-4.4.208-gnu/drivers/net/usb/lan78xx.c
--- linux-libre-4.4.207-gnu/drivers/net/usb/lan78xx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/usb/lan78xx.c	2020-01-04 07:34:38.000000000 -0500
@@ -1448,6 +1448,7 @@ static int lan78xx_mdio_init(struct lan7
 	dev->mdiobus->read = lan78xx_mdiobus_read;
 	dev->mdiobus->write = lan78xx_mdiobus_write;
 	dev->mdiobus->name = "lan78xx-mdiobus";
+	dev->mdiobus->parent = &dev->udev->dev;
 
 	snprintf(dev->mdiobus->id, MII_BUS_ID_SIZE, "usb-%03d:%03d",
 		 dev->udev->bus->busnum, dev->udev->devnum);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/ath/ath10k/txrx.c linux-libre-4.4.208-gnu/drivers/net/wireless/ath/ath10k/txrx.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/ath/ath10k/txrx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/ath/ath10k/txrx.c	2020-01-04 07:34:38.000000000 -0500
@@ -96,6 +96,8 @@ void ath10k_txrx_tx_unref(struct ath10k_
 
 	info = IEEE80211_SKB_CB(msdu);
 	memset(&info->status, 0, sizeof(info->status));
+	info->status.rates[0].idx = -1;
+
 	trace_ath10k_txrx_tx_unref(ar, tx_done->msdu_id);
 
 	if (tx_done->discard) {
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/iwlwifi/dvm/led.c linux-libre-4.4.208-gnu/drivers/net/wireless/iwlwifi/dvm/led.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/iwlwifi/dvm/led.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/iwlwifi/dvm/led.c	2020-01-04 07:34:38.000000000 -0500
@@ -184,6 +184,9 @@ void iwl_leds_init(struct iwl_priv *priv
 
 	priv->led.name = kasprintf(GFP_KERNEL, "%s-led",
 				   wiphy_name(priv->hw->wiphy));
+	if (!priv->led.name)
+		return;
+
 	priv->led.brightness_set = iwl_led_brightness_set;
 	priv->led.blink_set = iwl_led_blink_set;
 	priv->led.max_brightness = 1;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/iwlwifi/mvm/led.c linux-libre-4.4.208-gnu/drivers/net/wireless/iwlwifi/mvm/led.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/iwlwifi/mvm/led.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/iwlwifi/mvm/led.c	2020-01-04 07:34:38.000000000 -0500
@@ -109,6 +109,9 @@ int iwl_mvm_leds_init(struct iwl_mvm *mv
 
 	mvm->led.name = kasprintf(GFP_KERNEL, "%s-led",
 				   wiphy_name(mvm->hw->wiphy));
+	if (!mvm->led.name)
+		return -ENOMEM;
+
 	mvm->led.brightness_set = iwl_led_brightness_set;
 	mvm->led.max_brightness = 1;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/mwifiex/pcie.c linux-libre-4.4.208-gnu/drivers/net/wireless/mwifiex/pcie.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/mwifiex/pcie.c	2019-12-22 02:10:03.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/mwifiex/pcie.c	2020-01-04 12:45:05.000000000 -0500
@@ -577,8 +577,11 @@ static int mwifiex_pcie_init_evt_ring(st
 		skb_put(skb, MAX_EVENT_SIZE);
 
 		if (mwifiex_map_pci_memory(adapter, skb, MAX_EVENT_SIZE,
-					   PCI_DMA_FROMDEVICE))
+					   PCI_DMA_FROMDEVICE)) {
+			kfree_skb(skb);
+			kfree(card->evtbd_ring_vbase);
 			return -1;
+		}
 
 		buf_pa = MWIFIEX_SKB_DMA_ADDR(skb);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c linux-libre-4.4.208-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c	2020-01-04 07:34:38.000000000 -0500
@@ -1601,6 +1601,8 @@ static bool usb_cmd_send_packet(struct i
    * This is maybe necessary:
    * rtlpriv->cfg->ops->fill_tx_cmddesc(hw, buffer, 1, 1, skb);
    */
+	dev_kfree_skb(skb);
+
 	return true;
 }
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/net/wireless/realtek/rtlwifi/usb.c linux-libre-4.4.208-gnu/drivers/net/wireless/realtek/rtlwifi/usb.c
--- linux-libre-4.4.207-gnu/drivers/net/wireless/realtek/rtlwifi/usb.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/net/wireless/realtek/rtlwifi/usb.c	2020-01-04 07:34:38.000000000 -0500
@@ -1094,8 +1094,10 @@ int rtl_usb_probe(struct usb_interface *
 	rtlpriv->hw = hw;
 	rtlpriv->usb_data = kzalloc(RTL_USB_MAX_RX_COUNT * sizeof(u32),
 				    GFP_KERNEL);
-	if (!rtlpriv->usb_data)
+	if (!rtlpriv->usb_data) {
+		ieee80211_free_hw(hw);
 		return -ENOMEM;
+	}
 
 	/* this spin lock must be initialized early */
 	spin_lock_init(&rtlpriv->locks.usb_lock);
@@ -1158,6 +1160,7 @@ error_out:
 	_rtl_usb_io_handler_release(hw);
 	usb_put_dev(udev);
 	complete(&rtlpriv->firmware_loading_complete);
+	kfree(rtlpriv->usb_data);
 	return -ENODEV;
 }
 EXPORT_SYMBOL(rtl_usb_probe);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/parport/share.c linux-libre-4.4.208-gnu/drivers/parport/share.c
--- linux-libre-4.4.207-gnu/drivers/parport/share.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/parport/share.c	2020-01-04 07:34:38.000000000 -0500
@@ -228,6 +228,18 @@ static int port_check(struct device *dev
 	return 0;
 }
 
+/*
+ * Iterates through all the devices connected to the bus and return 1
+ * if the device is a parallel port.
+ */
+
+static int port_detect(struct device *dev, void *dev_drv)
+{
+	if (is_parport(dev))
+		return 1;
+	return 0;
+}
+
 /**
  *	parport_register_driver - register a parallel port device driver
  *	@drv: structure describing the driver
@@ -280,6 +292,15 @@ int __parport_register_driver(struct par
 		if (ret)
 			return ret;
 
+		/*
+		 * check if bus has any parallel port registered, if
+		 * none is found then load the lowlevel driver.
+		 */
+		ret = bus_for_each_dev(&parport_bus_type, NULL, NULL,
+				       port_detect);
+		if (!ret)
+			get_lowlevel_driver();
+
 		mutex_lock(&registration_lock);
 		if (drv->match_port)
 			bus_for_each_dev(&parport_bus_type, NULL, drv,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/pinctrl/sh-pfc/pfc-sh7734.c linux-libre-4.4.208-gnu/drivers/pinctrl/sh-pfc/pfc-sh7734.c
--- linux-libre-4.4.207-gnu/drivers/pinctrl/sh-pfc/pfc-sh7734.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/pinctrl/sh-pfc/pfc-sh7734.c	2020-01-04 07:34:38.000000000 -0500
@@ -1458,7 +1458,7 @@ static const struct pinmux_func pinmux_f
 	GPIO_FN(ET0_ETXD2_A),
 	GPIO_FN(EX_CS5), GPIO_FN(SD1_CMD_A), GPIO_FN(ATADIR), GPIO_FN(QSSL_B),
 	GPIO_FN(ET0_ETXD3_A),
-	GPIO_FN(RD_WR), GPIO_FN(TCLK1_B),
+	GPIO_FN(RD_WR), GPIO_FN(TCLK0), GPIO_FN(CAN_CLK_B), GPIO_FN(ET0_ETXD4),
 	GPIO_FN(EX_WAIT0), GPIO_FN(TCLK1_B),
 	GPIO_FN(EX_WAIT1), GPIO_FN(SD1_DAT0_A), GPIO_FN(DREQ2),
 		GPIO_FN(CAN1_TX_C), GPIO_FN(ET0_LINK_C), GPIO_FN(ET0_ETXD5_A),
@@ -1954,7 +1954,7 @@ static const struct pinmux_cfg_reg pinmu
 	    /* IP3_20 [1] */
 		FN_EX_WAIT0, FN_TCLK1_B,
 	    /* IP3_19_18 [2] */
-		FN_RD_WR, FN_TCLK1_B, 0, 0,
+		FN_RD_WR, FN_TCLK0, FN_CAN_CLK_B, FN_ET0_ETXD4,
 	    /* IP3_17_15 [3] */
 		FN_EX_CS5, FN_SD1_CMD_A, FN_ATADIR, FN_QSSL_B,
 		FN_ET0_ETXD3_A, 0, 0, 0,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/platform/x86/hp-wmi.c linux-libre-4.4.208-gnu/drivers/platform/x86/hp-wmi.c
--- linux-libre-4.4.207-gnu/drivers/platform/x86/hp-wmi.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/platform/x86/hp-wmi.c	2020-01-04 07:34:38.000000000 -0500
@@ -309,7 +309,7 @@ static int __init hp_wmi_bios_2008_later
 
 static int __init hp_wmi_bios_2009_later(void)
 {
-	int state = 0;
+	u8 state[128];
 	int ret = hp_wmi_perform_query(HPWMI_FEATURE2_QUERY, 0, &state,
 				       sizeof(state), sizeof(state));
 	if (!ret)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/regulator/max8907-regulator.c linux-libre-4.4.208-gnu/drivers/regulator/max8907-regulator.c
--- linux-libre-4.4.207-gnu/drivers/regulator/max8907-regulator.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/regulator/max8907-regulator.c	2020-01-04 07:34:38.000000000 -0500
@@ -299,7 +299,10 @@ static int max8907_regulator_probe(struc
 	memcpy(pmic->desc, max8907_regulators, sizeof(pmic->desc));
 
 	/* Backwards compatibility with MAX8907B; SD1 uses different voltages */
-	regmap_read(max8907->regmap_gen, MAX8907_REG_II2RR, &val);
+	ret = regmap_read(max8907->regmap_gen, MAX8907_REG_II2RR, &val);
+	if (ret)
+		return ret;
+
 	if ((val & MAX8907_II2RR_VERSION_MASK) ==
 	    MAX8907_II2RR_VERSION_REV_B) {
 		pmic->desc[MAX8907_SD1].min_uV = 637500;
@@ -336,14 +339,20 @@ static int max8907_regulator_probe(struc
 		}
 
 		if (pmic->desc[i].ops == &max8907_ldo_ops) {
-			regmap_read(config.regmap, pmic->desc[i].enable_reg,
+			ret = regmap_read(config.regmap, pmic->desc[i].enable_reg,
 				    &val);
+			if (ret)
+				return ret;
+
 			if ((val & MAX8907_MASK_LDO_SEQ) !=
 			    MAX8907_MASK_LDO_SEQ)
 				pmic->desc[i].ops = &max8907_ldo_hwctl_ops;
 		} else if (pmic->desc[i].ops == &max8907_out5v_ops) {
-			regmap_read(config.regmap, pmic->desc[i].enable_reg,
+			ret = regmap_read(config.regmap, pmic->desc[i].enable_reg,
 				    &val);
+			if (ret)
+				return ret;
+
 			if ((val & (MAX8907_MASK_OUT5V_VINEN |
 						MAX8907_MASK_OUT5V_ENSRC)) !=
 			    MAX8907_MASK_OUT5V_ENSRC)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/csiostor/csio_lnode.c linux-libre-4.4.208-gnu/drivers/scsi/csiostor/csio_lnode.c
--- linux-libre-4.4.207-gnu/drivers/scsi/csiostor/csio_lnode.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/csiostor/csio_lnode.c	2020-01-04 07:34:38.000000000 -0500
@@ -301,6 +301,7 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *h
 	struct fc_fdmi_port_name *port_name;
 	uint8_t buf[64];
 	uint8_t *fc4_type;
+	unsigned long flags;
 
 	if (fdmi_req->wr_status != FW_SUCCESS) {
 		csio_ln_dbg(ln, "WR error:%x in processing fdmi rhba cmd\n",
@@ -377,13 +378,13 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *h
 	len = (uint32_t)(pld - (uint8_t *)cmd);
 
 	/* Submit FDMI RPA request */
-	spin_lock_irq(&hw->lock);
+	spin_lock_irqsave(&hw->lock, flags);
 	if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_done,
 				FCOE_CT, &fdmi_req->dma_buf, len)) {
 		CSIO_INC_STATS(ln, n_fdmi_err);
 		csio_ln_dbg(ln, "Failed to issue fdmi rpa req\n");
 	}
-	spin_unlock_irq(&hw->lock);
+	spin_unlock_irqrestore(&hw->lock, flags);
 }
 
 /*
@@ -404,6 +405,7 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *h
 	struct fc_fdmi_rpl *reg_pl;
 	struct fs_fdmi_attrs *attrib_blk;
 	uint8_t buf[64];
+	unsigned long flags;
 
 	if (fdmi_req->wr_status != FW_SUCCESS) {
 		csio_ln_dbg(ln, "WR error:%x in processing fdmi dprt cmd\n",
@@ -483,13 +485,13 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *h
 	attrib_blk->numattrs = htonl(numattrs);
 
 	/* Submit FDMI RHBA request */
-	spin_lock_irq(&hw->lock);
+	spin_lock_irqsave(&hw->lock, flags);
 	if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_rhba_cbfn,
 				FCOE_CT, &fdmi_req->dma_buf, len)) {
 		CSIO_INC_STATS(ln, n_fdmi_err);
 		csio_ln_dbg(ln, "Failed to issue fdmi rhba req\n");
 	}
-	spin_unlock_irq(&hw->lock);
+	spin_unlock_irqrestore(&hw->lock, flags);
 }
 
 /*
@@ -504,6 +506,7 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *h
 	void *cmd;
 	struct fc_fdmi_port_name *port_name;
 	uint32_t len;
+	unsigned long flags;
 
 	if (fdmi_req->wr_status != FW_SUCCESS) {
 		csio_ln_dbg(ln, "WR error:%x in processing fdmi dhba cmd\n",
@@ -534,13 +537,13 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *h
 	len += sizeof(*port_name);
 
 	/* Submit FDMI request */
-	spin_lock_irq(&hw->lock);
+	spin_lock_irqsave(&hw->lock, flags);
 	if (csio_ln_mgmt_submit_req(fdmi_req, csio_ln_fdmi_dprt_cbfn,
 				FCOE_CT, &fdmi_req->dma_buf, len)) {
 		CSIO_INC_STATS(ln, n_fdmi_err);
 		csio_ln_dbg(ln, "Failed to issue fdmi dprt req\n");
 	}
-	spin_unlock_irq(&hw->lock);
+	spin_unlock_irqrestore(&hw->lock, flags);
 }
 
 /**
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_els.c linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_els.c
--- linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_els.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_els.c	2020-01-04 07:34:38.000000000 -0500
@@ -3839,7 +3839,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba,
 		mempool_free(mbox, phba->mbox_mem_pool);
 	}
 out:
-	if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {
+	if (ndlp && NLP_CHK_NODE_ACT(ndlp) && shost) {
 		spin_lock_irq(shost->host_lock);
 		ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN | NLP_RM_DFLT_RPI);
 		spin_unlock_irq(shost->host_lock);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_nportdisc.c linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_nportdisc.c
--- linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_nportdisc.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_nportdisc.c	2020-01-04 07:34:38.000000000 -0500
@@ -454,8 +454,10 @@ lpfc_rcv_plogi(struct lpfc_vport *vport,
 	 * single discovery thread, this will cause a huge delay in
 	 * discovery. Also this will cause multiple state machines
 	 * running in parallel for this node.
+	 * This only applies to a fabric environment.
 	 */
-	if (ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) {
+	if ((ndlp->nlp_state == NLP_STE_PLOGI_ISSUE) &&
+	    (vport->fc_flag & FC_FABRIC)) {
 		/* software abort outstanding PLOGI */
 		lpfc_els_abort(phba, ndlp);
 	}
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_sli.c linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_sli.c
--- linux-libre-4.4.207-gnu/drivers/scsi/lpfc/lpfc_sli.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/lpfc/lpfc_sli.c	2020-01-04 07:34:38.000000000 -0500
@@ -11759,13 +11759,19 @@ send_current_mbox:
 	phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
 	/* Setting active mailbox pointer need to be in sync to flag clear */
 	phba->sli.mbox_active = NULL;
+	if (bf_get(lpfc_trailer_consumed, mcqe))
+		lpfc_sli4_mq_release(phba->sli4_hba.mbx_wq);
 	spin_unlock_irqrestore(&phba->hbalock, iflags);
 	/* Wake up worker thread to post the next pending mailbox command */
 	lpfc_worker_wake_up(phba);
+	return workposted;
+
 out_no_mqe_complete:
+	spin_lock_irqsave(&phba->hbalock, iflags);
 	if (bf_get(lpfc_trailer_consumed, mcqe))
 		lpfc_sli4_mq_release(phba->sli4_hba.mbx_wq);
-	return workposted;
+	spin_unlock_irqrestore(&phba->hbalock, iflags);
+	return false;
 }
 
 /**
@@ -15786,6 +15792,13 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phb
 static void
 __lpfc_sli4_free_rpi(struct lpfc_hba *phba, int rpi)
 {
+	/*
+	 * if the rpi value indicates a prior unreg has already
+	 * been done, skip the unreg.
+	 */
+	if (rpi == LPFC_RPI_ALLOC_ERROR)
+		return;
+
 	if (test_and_clear_bit(rpi, phba->sli4_hba.rpi_bmask)) {
 		phba->sli4_hba.rpi_count--;
 		phba->sli4_hba.max_cfg_param.rpi_used--;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/mpt3sas/mpt3sas_ctl.c linux-libre-4.4.208-gnu/drivers/scsi/mpt3sas/mpt3sas_ctl.c
--- linux-libre-4.4.207-gnu/drivers/scsi/mpt3sas/mpt3sas_ctl.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/mpt3sas/mpt3sas_ctl.c	2020-01-04 07:34:38.000000000 -0500
@@ -1456,7 +1456,8 @@ _ctl_diag_register_2(struct MPT3SAS_ADAP
 			    " for diag buffers, requested size(%d)\n",
 			    ioc->name, __func__, request_data_sz);
 			mpt3sas_base_free_smid(ioc, smid);
-			return -ENOMEM;
+			rc = -ENOMEM;
+			goto out;
 		}
 		ioc->diag_buffer[buffer_type] = request_data;
 		ioc->diag_buffer_sz[buffer_type] = request_data_sz;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/pm8001/pm80xx_hwi.c linux-libre-4.4.208-gnu/drivers/scsi/pm8001/pm80xx_hwi.c
--- linux-libre-4.4.207-gnu/drivers/scsi/pm8001/pm80xx_hwi.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/pm8001/pm80xx_hwi.c	2020-01-04 07:34:38.000000000 -0500
@@ -2368,6 +2368,8 @@ mpi_sata_completion(struct pm8001_hba_in
 			pm8001_printk("task 0x%p done with io_status 0x%x"
 			" resp 0x%x stat 0x%x but aborted by upper layer!\n",
 			t, status, ts->resp, ts->stat));
+		if (t->slow_task)
+			complete(&t->slow_task->completion);
 		pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
 	} else {
 		spin_unlock_irqrestore(&t->task_state_lock, flags);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/scsi_trace.c linux-libre-4.4.208-gnu/drivers/scsi/scsi_trace.c
--- linux-libre-4.4.207-gnu/drivers/scsi/scsi_trace.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/scsi_trace.c	2020-01-04 07:34:38.000000000 -0500
@@ -29,15 +29,18 @@ static const char *
 scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len)
 {
 	const char *ret = trace_seq_buffer_ptr(p);
-	sector_t lba = 0, txlen = 0;
+	u32 lba = 0, txlen;
 
 	lba |= ((cdb[1] & 0x1F) << 16);
 	lba |=  (cdb[2] << 8);
 	lba |=   cdb[3];
-	txlen = cdb[4];
+	/*
+	 * From SBC-2: a TRANSFER LENGTH field set to zero specifies that 256
+	 * logical blocks shall be read (READ(6)) or written (WRITE(6)).
+	 */
+	txlen = cdb[4] ? cdb[4] : 256;
 
-	trace_seq_printf(p, "lba=%llu txlen=%llu",
-			 (unsigned long long)lba, (unsigned long long)txlen);
+	trace_seq_printf(p, "lba=%u txlen=%u", lba, txlen);
 	trace_seq_putc(p, 0);
 
 	return ret;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/scsi/ufs/ufshcd.c linux-libre-4.4.208-gnu/drivers/scsi/ufs/ufshcd.c
--- linux-libre-4.4.207-gnu/drivers/scsi/ufs/ufshcd.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/scsi/ufs/ufshcd.c	2020-01-04 07:34:38.000000000 -0500
@@ -1809,10 +1809,10 @@ static int ufshcd_query_descriptor(struc
 		goto out_unlock;
 	}
 
-	hba->dev_cmd.query.descriptor = NULL;
 	*buf_len = be16_to_cpu(response->upiu_res.length);
 
 out_unlock:
+	hba->dev_cmd.query.descriptor = NULL;
 	mutex_unlock(&hba->dev_cmd.lock);
 out:
 	ufshcd_release(hba);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/spi/spidev.c linux-libre-4.4.208-gnu/drivers/spi/spidev.c
--- linux-libre-4.4.207-gnu/drivers/spi/spidev.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/spi/spidev.c	2020-01-04 07:34:38.000000000 -0500
@@ -662,6 +662,9 @@ static int spidev_release(struct inode *
 		if (dofree)
 			kfree(spidev);
 	}
+#ifdef CONFIG_SPI_SLAVE
+	spi_slave_abort(spidev->spi);
+#endif
 	mutex_unlock(&device_list_lock);
 
 	return 0;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/spi/spi-img-spfi.c linux-libre-4.4.208-gnu/drivers/spi/spi-img-spfi.c
--- linux-libre-4.4.207-gnu/drivers/spi/spi-img-spfi.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/spi/spi-img-spfi.c	2020-01-04 07:34:38.000000000 -0500
@@ -673,6 +673,8 @@ static int img_spfi_probe(struct platfor
 			dma_release_channel(spfi->tx_ch);
 		if (spfi->rx_ch)
 			dma_release_channel(spfi->rx_ch);
+		spfi->tx_ch = NULL;
+		spfi->rx_ch = NULL;
 		dev_warn(spfi->dev, "Failed to get DMA channels, falling back to PIO mode\n");
 	} else {
 		master->dma_tx = spfi->tx_ch;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/spi/spi-pxa2xx.c linux-libre-4.4.208-gnu/drivers/spi/spi-pxa2xx.c
--- linux-libre-4.4.207-gnu/drivers/spi/spi-pxa2xx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/spi/spi-pxa2xx.c	2020-01-04 07:34:38.000000000 -0500
@@ -1425,7 +1425,13 @@ pxa2xx_spi_init_pdata(struct platform_de
 	}
 
 	ssp->clk = devm_clk_get(&pdev->dev, NULL);
+	if (IS_ERR(ssp->clk))
+		return NULL;
+
 	ssp->irq = platform_get_irq(pdev, 0);
+	if (ssp->irq < 0)
+		return NULL;
+
 	ssp->type = type;
 	ssp->pdev = pdev;
 	ssp->port_id = pxa2xx_spi_get_port_id(adev);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/spi/spi-tegra20-slink.c linux-libre-4.4.208-gnu/drivers/spi/spi-tegra20-slink.c
--- linux-libre-4.4.207-gnu/drivers/spi/spi-tegra20-slink.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/spi/spi-tegra20-slink.c	2020-01-04 07:34:38.000000000 -0500
@@ -1078,7 +1078,7 @@ static int tegra_slink_probe(struct plat
 	ret = clk_enable(tspi->clk);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "Clock enable failed %d\n", ret);
-		goto exit_free_master;
+		goto exit_clk_unprepare;
 	}
 
 	spi_irq = platform_get_irq(pdev, 0);
@@ -1151,6 +1151,8 @@ exit_free_irq:
 	free_irq(spi_irq, tspi);
 exit_clk_disable:
 	clk_disable(tspi->clk);
+exit_clk_unprepare:
+	clk_unprepare(tspi->clk);
 exit_free_master:
 	spi_master_put(master);
 	return ret;
@@ -1164,6 +1166,7 @@ static int tegra_slink_remove(struct pla
 	free_irq(tspi->irq, tspi);
 
 	clk_disable(tspi->clk);
+	clk_unprepare(tspi->clk);
 
 	if (tspi->tx_dma_chan)
 		tegra_slink_deinit_dma_param(tspi, false);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/staging/comedi/drivers/gsc_hpdi.c linux-libre-4.4.208-gnu/drivers/staging/comedi/drivers/gsc_hpdi.c
--- linux-libre-4.4.207-gnu/drivers/staging/comedi/drivers/gsc_hpdi.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/staging/comedi/drivers/gsc_hpdi.c	2020-01-04 07:34:38.000000000 -0500
@@ -632,12 +632,22 @@ static int gsc_hpdi_auto_attach(struct c
 		devpriv->dio_buffer[i] =
 		    pci_alloc_consistent(pcidev, DMA_BUFFER_SIZE,
 					 &devpriv->dio_buffer_phys_addr[i]);
+		if (!devpriv->dio_buffer[i]) {
+			dev_warn(dev->class_dev,
+				 "failed to allocate DMA buffer\n");
+			return -ENOMEM;
+		}
 	}
 	/* allocate dma descriptors */
 	devpriv->dma_desc = pci_alloc_consistent(pcidev,
 						 sizeof(struct plx_dma_desc) *
 						 NUM_DMA_DESCRIPTORS,
 						 &devpriv->dma_desc_phys_addr);
+	if (!devpriv->dma_desc) {
+		dev_warn(dev->class_dev,
+			 "failed to allocate DMA descriptors\n");
+		return -ENOMEM;
+	}
 	if (devpriv->dma_desc_phys_addr & 0xf) {
 		dev_warn(dev->class_dev,
 			 " dma descriptors not quad-word aligned (bug)\n");
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/staging/fbtft/fbtft-core.c linux-libre-4.4.208-gnu/drivers/staging/fbtft/fbtft-core.c
--- linux-libre-4.4.207-gnu/drivers/staging/fbtft/fbtft-core.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/staging/fbtft/fbtft-core.c	2020-01-04 07:34:38.000000000 -0500
@@ -765,7 +765,7 @@ struct fb_info *fbtft_framebuffer_alloc(
 	fbdefio->deferred_io =     fbtft_deferred_io;
 	fb_deferred_io_init(info);
 
-	strncpy(info->fix.id, dev->driver->name, 16);
+	snprintf(info->fix.id, sizeof(info->fix.id), "%s", dev->driver->name);
 	info->fix.type =           FB_TYPE_PACKED_PIXELS;
 	info->fix.visual =         FB_VISUAL_TRUECOLOR;
 	info->fix.xpanstep =	   0;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/staging/rtl8188eu/core/rtw_xmit.c linux-libre-4.4.208-gnu/drivers/staging/rtl8188eu/core/rtw_xmit.c
--- linux-libre-4.4.207-gnu/drivers/staging/rtl8188eu/core/rtw_xmit.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/staging/rtl8188eu/core/rtw_xmit.c	2020-01-04 07:34:38.000000000 -0500
@@ -822,7 +822,7 @@ s32 rtw_make_wlanhdr(struct adapter *pad
 			memcpy(pwlanhdr->addr2, get_bssid(pmlmepriv), ETH_ALEN);
 			memcpy(pwlanhdr->addr3, pattrib->src, ETH_ALEN);
 
-			if (psta->qos_option)
+			if (psta && psta->qos_option)
 				qos_option = true;
 		} else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) ||
 			   check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) {
@@ -830,7 +830,7 @@ s32 rtw_make_wlanhdr(struct adapter *pad
 			memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN);
 			memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN);
 
-			if (psta->qos_option)
+			if (psta && psta->qos_option)
 				qos_option = true;
 		} else {
 			RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("fw_state:%x is not allowed to xmit frame\n", get_fwstate(pmlmepriv)));
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/target/iscsi/iscsi_target_auth.c linux-libre-4.4.208-gnu/drivers/target/iscsi/iscsi_target_auth.c
--- linux-libre-4.4.207-gnu/drivers/target/iscsi/iscsi_target_auth.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/target/iscsi/iscsi_target_auth.c	2020-01-04 07:34:38.000000000 -0500
@@ -74,7 +74,7 @@ static int chap_check_algorithm(const ch
 		if (!token)
 			goto out;
 
-		if (!strncmp(token, "5", 1)) {
+		if (!strcmp(token, "5")) {
 			pr_debug("Selected MD5 Algorithm\n");
 			kfree(orig);
 			return CHAP_DIGEST_MD5;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/target/iscsi/iscsi_target.c linux-libre-4.4.208-gnu/drivers/target/iscsi/iscsi_target.c
--- linux-libre-4.4.207-gnu/drivers/target/iscsi/iscsi_target.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/target/iscsi/iscsi_target.c	2020-01-04 07:34:38.000000000 -0500
@@ -993,7 +993,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_c
 		hdr->cmdsn, be32_to_cpu(hdr->data_length), payload_length,
 		conn->cid);
 
-	target_get_sess_cmd(&cmd->se_cmd, true);
+	if (target_get_sess_cmd(&cmd->se_cmd, true) < 0)
+		return iscsit_add_reject_cmd(cmd,
+				ISCSI_REASON_WAITING_FOR_LOGOUT, buf);
 
 	cmd->sense_reason = transport_lookup_cmd_lun(&cmd->se_cmd,
 						     scsilun_to_int(&hdr->lun));
@@ -1804,7 +1806,9 @@ iscsit_handle_task_mgt_cmd(struct iscsi_
 			      conn->sess->se_sess, 0, DMA_NONE,
 			      TCM_SIMPLE_TAG, cmd->sense_buffer + 2);
 
-	target_get_sess_cmd(&cmd->se_cmd, true);
+	if (target_get_sess_cmd(&cmd->se_cmd, true) < 0)
+		return iscsit_add_reject_cmd(cmd,
+				ISCSI_REASON_WAITING_FOR_LOGOUT, buf);
 
 	/*
 	 * TASK_REASSIGN for ERL=2 / connection stays inside of
@@ -4390,6 +4394,8 @@ int iscsit_close_connection(
 	 * must wait until they have completed.
 	 */
 	iscsit_check_conn_usage_count(conn);
+	target_sess_cmd_list_set_waiting(sess->se_sess);
+	target_wait_for_sess_cmds(sess->se_sess);
 
 	if (conn->conn_rx_hash.tfm)
 		crypto_free_hash(conn->conn_rx_hash.tfm);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/usb/host/ehci-q.c linux-libre-4.4.208-gnu/drivers/usb/host/ehci-q.c
--- linux-libre-4.4.207-gnu/drivers/usb/host/ehci-q.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/usb/host/ehci-q.c	2020-01-04 07:34:38.000000000 -0500
@@ -40,6 +40,10 @@
 
 /*-------------------------------------------------------------------------*/
 
+/* PID Codes that are used here, from EHCI specification, Table 3-16. */
+#define PID_CODE_IN    1
+#define PID_CODE_SETUP 2
+
 /* fill a qtd, returning how much of the buffer we were able to queue up */
 
 static int
@@ -199,7 +203,7 @@ static int qtd_copy_status (
 	int	status = -EINPROGRESS;
 
 	/* count IN/OUT bytes, not SETUP (even short packets) */
-	if (likely (QTD_PID (token) != 2))
+	if (likely(QTD_PID(token) != PID_CODE_SETUP))
 		urb->actual_length += length - QTD_LENGTH (token);
 
 	/* don't modify error codes */
@@ -215,6 +219,13 @@ static int qtd_copy_status (
 		if (token & QTD_STS_BABBLE) {
 			/* FIXME "must" disable babbling device's port too */
 			status = -EOVERFLOW;
+		/*
+		 * When MMF is active and PID Code is IN, queue is halted.
+		 * EHCI Specification, Table 4-13.
+		 */
+		} else if ((token & QTD_STS_MMF) &&
+					(QTD_PID(token) == PID_CODE_IN)) {
+			status = -EPROTO;
 		/* CERR nonzero + halt --> stall */
 		} else if (QTD_CERR(token)) {
 			status = -EPIPE;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/usb/host/xhci-pci.c linux-libre-4.4.208-gnu/drivers/usb/host/xhci-pci.c
--- linux-libre-4.4.207-gnu/drivers/usb/host/xhci-pci.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/usb/host/xhci-pci.c	2020-01-04 07:34:38.000000000 -0500
@@ -444,7 +444,6 @@ static int xhci_pci_resume(struct usb_hc
 	retval = xhci_resume(xhci, hibernated);
 	return retval;
 }
-#endif /* CONFIG_PM */
 
 static void xhci_pci_shutdown(struct usb_hcd *hcd)
 {
@@ -457,6 +456,7 @@ static void xhci_pci_shutdown(struct usb
 	if (xhci->quirks & XHCI_SPURIOUS_WAKEUP)
 		pci_set_power_state(pdev, PCI_D3hot);
 }
+#endif /* CONFIG_PM */
 
 /*-------------------------------------------------------------------------*/
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/usb/renesas_usbhs/common.h linux-libre-4.4.208-gnu/drivers/usb/renesas_usbhs/common.h
--- linux-libre-4.4.207-gnu/drivers/usb/renesas_usbhs/common.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/usb/renesas_usbhs/common.h	2020-01-04 07:34:38.000000000 -0500
@@ -163,11 +163,12 @@ struct usbhs_priv;
 #define VBSTS	(1 << 7)	/* VBUS_0 and VBUSIN_0 Input Status */
 #define VALID	(1 << 3)	/* USB Request Receive */
 
-#define DVSQ_MASK		(0x3 << 4)	/* Device State */
+#define DVSQ_MASK		(0x7 << 4)	/* Device State */
 #define  POWER_STATE		(0 << 4)
 #define  DEFAULT_STATE		(1 << 4)
 #define  ADDRESS_STATE		(2 << 4)
 #define  CONFIGURATION_STATE	(3 << 4)
+#define  SUSPENDED_STATE	(4 << 4)
 
 #define CTSQ_MASK		(0x7)	/* Control Transfer Stage */
 #define  IDLE_SETUP_STAGE	0	/* Idle stage or setup stage */
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/usb/renesas_usbhs/mod_gadget.c linux-libre-4.4.208-gnu/drivers/usb/renesas_usbhs/mod_gadget.c
--- linux-libre-4.4.207-gnu/drivers/usb/renesas_usbhs/mod_gadget.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/usb/renesas_usbhs/mod_gadget.c	2020-01-04 07:34:38.000000000 -0500
@@ -467,12 +467,18 @@ static int usbhsg_irq_dev_state(struct u
 {
 	struct usbhsg_gpriv *gpriv = usbhsg_priv_to_gpriv(priv);
 	struct device *dev = usbhsg_gpriv_to_dev(gpriv);
+	int state = usbhs_status_get_device_state(irq_state);
 
 	gpriv->gadget.speed = usbhs_bus_get_speed(priv);
 
-	dev_dbg(dev, "state = %x : speed : %d\n",
-		usbhs_status_get_device_state(irq_state),
-		gpriv->gadget.speed);
+	dev_dbg(dev, "state = %x : speed : %d\n", state, gpriv->gadget.speed);
+
+	if (gpriv->gadget.speed != USB_SPEED_UNKNOWN &&
+	    (state & SUSPENDED_STATE)) {
+		if (gpriv->driver && gpriv->driver->suspend)
+			gpriv->driver->suspend(&gpriv->gadget);
+		usb_gadget_set_state(&gpriv->gadget, USB_STATE_SUSPENDED);
+	}
 
 	return 0;
 }
diff -druNp --no-dereference linux-libre-4.4.207-gnu/drivers/usb/usbip/vhci_rx.c linux-libre-4.4.208-gnu/drivers/usb/usbip/vhci_rx.c
--- linux-libre-4.4.207-gnu/drivers/usb/usbip/vhci_rx.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/drivers/usb/usbip/vhci_rx.c	2020-01-04 07:34:38.000000000 -0500
@@ -89,16 +89,21 @@ static void vhci_recv_ret_submit(struct
 	usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);
 
 	/* recv transfer buffer */
-	if (usbip_recv_xbuff(ud, urb) < 0)
-		return;
+	if (usbip_recv_xbuff(ud, urb) < 0) {
+		urb->status = -EPROTO;
+		goto error;
+	}
 
 	/* recv iso_packet_descriptor */
-	if (usbip_recv_iso(ud, urb) < 0)
-		return;
+	if (usbip_recv_iso(ud, urb) < 0) {
+		urb->status = -EPROTO;
+		goto error;
+	}
 
 	/* restore the padding in iso packets */
 	usbip_pad_iso(ud, urb);
 
+error:
 	if (usbip_dbg_flag_vhci_rx)
 		usbip_dump_urb(urb);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/ctree.c linux-libre-4.4.208-gnu/fs/btrfs/ctree.c
--- linux-libre-4.4.207-gnu/fs/btrfs/ctree.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/ctree.c	2020-01-04 07:34:38.000000000 -0500
@@ -425,7 +425,7 @@ void btrfs_put_tree_mod_seq(struct btrfs
 	for (node = rb_first(tm_root); node; node = next) {
 		next = rb_next(node);
 		tm = container_of(node, struct tree_mod_elem, node);
-		if (tm->seq > min_seq)
+		if (tm->seq >= min_seq)
 			continue;
 		rb_erase(node, tm_root);
 		kfree(tm);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/disk-io.c linux-libre-4.4.208-gnu/fs/btrfs/disk-io.c
--- linux-libre-4.4.207-gnu/fs/btrfs/disk-io.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/disk-io.c	2020-01-04 07:34:38.000000000 -0500
@@ -1698,8 +1698,8 @@ static void end_workqueue_fn(struct btrf
 	bio->bi_error = end_io_wq->error;
 	bio->bi_private = end_io_wq->private;
 	bio->bi_end_io = end_io_wq->end_io;
-	kmem_cache_free(btrfs_end_io_wq_cache, end_io_wq);
 	bio_endio(bio);
+	kmem_cache_free(btrfs_end_io_wq_cache, end_io_wq);
 }
 
 static int cleaner_kthread(void *arg)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/extent_io.c linux-libre-4.4.208-gnu/fs/btrfs/extent_io.c
--- linux-libre-4.4.207-gnu/fs/btrfs/extent_io.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/extent_io.c	2020-01-04 07:34:38.000000000 -0500
@@ -4948,12 +4948,14 @@ struct extent_buffer *alloc_test_extent_
 		return eb;
 	eb = alloc_dummy_extent_buffer(fs_info, start);
 	if (!eb)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 	eb->fs_info = fs_info;
 again:
 	ret = radix_tree_preload(GFP_NOFS & ~__GFP_HIGHMEM);
-	if (ret)
+	if (ret) {
+		exists = ERR_PTR(ret);
 		goto free_eb;
+	}
 	spin_lock(&fs_info->buffer_lock);
 	ret = radix_tree_insert(&fs_info->buffer_radix,
 				start >> PAGE_CACHE_SHIFT, eb);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/inode.c linux-libre-4.4.208-gnu/fs/btrfs/inode.c
--- linux-libre-4.4.207-gnu/fs/btrfs/inode.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/inode.c	2020-01-04 07:34:38.000000000 -0500
@@ -5506,7 +5506,6 @@ static void inode_tree_del(struct inode
 	spin_unlock(&root->inode_lock);
 
 	if (empty && btrfs_root_refs(&root->root_item) == 0) {
-		synchronize_srcu(&root->fs_info->subvol_srcu);
 		spin_lock(&root->inode_lock);
 		empty = RB_EMPTY_ROOT(&root->inode_tree);
 		spin_unlock(&root->inode_lock);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/ioctl.c linux-libre-4.4.208-gnu/fs/btrfs/ioctl.c
--- linux-libre-4.4.207-gnu/fs/btrfs/ioctl.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/ioctl.c	2020-01-04 07:34:38.000000000 -0500
@@ -594,12 +594,18 @@ static noinline int create_subvol(struct
 
 	btrfs_i_size_write(dir, dir->i_size + namelen * 2);
 	ret = btrfs_update_inode(trans, root, dir);
-	BUG_ON(ret);
+	if (ret) {
+		btrfs_abort_transaction(trans, root, ret);
+		goto fail;
+	}
 
 	ret = btrfs_add_root_ref(trans, root->fs_info->tree_root,
 				 objectid, root->root_key.objectid,
 				 btrfs_ino(dir), index, name, namelen);
-	BUG_ON(ret);
+	if (ret) {
+		btrfs_abort_transaction(trans, root, ret);
+		goto fail;
+	}
 
 	ret = btrfs_uuid_tree_add(trans, root->fs_info->uuid_root,
 				  root_item.uuid, BTRFS_UUID_KEY_SUBVOL,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/relocation.c linux-libre-4.4.208-gnu/fs/btrfs/relocation.c
--- linux-libre-4.4.207-gnu/fs/btrfs/relocation.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/relocation.c	2020-01-04 07:34:38.000000000 -0500
@@ -4454,6 +4454,7 @@ int btrfs_recover_relocation(struct btrf
 				       reloc_root->root_key.offset);
 		if (IS_ERR(fs_root)) {
 			err = PTR_ERR(fs_root);
+			list_add_tail(&reloc_root->root_list, &reloc_roots);
 			goto out_free;
 		}
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/tests/qgroup-tests.c linux-libre-4.4.208-gnu/fs/btrfs/tests/qgroup-tests.c
--- linux-libre-4.4.207-gnu/fs/btrfs/tests/qgroup-tests.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/tests/qgroup-tests.c	2020-01-04 07:34:38.000000000 -0500
@@ -477,9 +477,9 @@ int btrfs_test_qgroups(void)
 	 * *cough*backref walking code*cough*
 	 */
 	root->node = alloc_test_extent_buffer(root->fs_info, 4096);
-	if (!root->node) {
+	if (IS_ERR(root->node)) {
 		test_msg("Couldn't allocate dummy buffer\n");
-		ret = -ENOMEM;
+		ret = PTR_ERR(root->node);
 		goto out;
 	}
 	btrfs_set_header_level(root->node, 0);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/btrfs/uuid-tree.c linux-libre-4.4.208-gnu/fs/btrfs/uuid-tree.c
--- linux-libre-4.4.207-gnu/fs/btrfs/uuid-tree.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/btrfs/uuid-tree.c	2020-01-04 07:34:38.000000000 -0500
@@ -332,6 +332,8 @@ again_search_slot:
 				}
 				if (ret < 0 && ret != -ENOENT)
 					goto out;
+				key.offset++;
+				goto again_search_slot;
 			}
 			item_size -= sizeof(subid_le);
 			offset += sizeof(subid_le);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/ext4/dir.c linux-libre-4.4.208-gnu/fs/ext4/dir.c
--- linux-libre-4.4.207-gnu/fs/ext4/dir.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/ext4/dir.c	2020-01-04 07:34:38.000000000 -0500
@@ -75,6 +75,11 @@ int __ext4_check_dir_entry(const char *f
 		error_msg = "rec_len is too small for name_len";
 	else if (unlikely(((char *) de - buf) + rlen > size))
 		error_msg = "directory entry overrun";
+	else if (unlikely(((char *) de - buf) + rlen >
+			  size - EXT4_DIR_REC_LEN(1) &&
+			  ((char *) de - buf) + rlen != size)) {
+		error_msg = "directory entry too close to block end";
+	}
 	else if (unlikely(le32_to_cpu(de->inode) >
 			le32_to_cpu(EXT4_SB(dir->i_sb)->s_es->s_inodes_count)))
 		error_msg = "inode out of bounds";
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/ext4/namei.c linux-libre-4.4.208-gnu/fs/ext4/namei.c
--- linux-libre-4.4.207-gnu/fs/ext4/namei.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/ext4/namei.c	2020-01-04 07:34:38.000000000 -0500
@@ -3040,18 +3040,17 @@ static int ext4_unlink(struct inode *dir
 	if (IS_DIRSYNC(dir))
 		ext4_handle_sync(handle);
 
-	if (inode->i_nlink == 0) {
-		ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
-				   dentry->d_name.len, dentry->d_name.name);
-		set_nlink(inode, 1);
-	}
 	retval = ext4_delete_entry(handle, dir, de, bh);
 	if (retval)
 		goto end_unlink;
 	dir->i_ctime = dir->i_mtime = ext4_current_time(dir);
 	ext4_update_dx_flag(dir);
 	ext4_mark_inode_dirty(handle, dir);
-	drop_nlink(inode);
+	if (inode->i_nlink == 0)
+		ext4_warning_inode(inode, "Deleting file '%.*s' with no links",
+				   dentry->d_name.len, dentry->d_name.name);
+	else
+		drop_nlink(inode);
 	if (!inode->i_nlink)
 		ext4_orphan_add(handle, inode);
 	inode->i_ctime = ext4_current_time(inode);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/jbd2/commit.c linux-libre-4.4.208-gnu/fs/jbd2/commit.c
--- linux-libre-4.4.207-gnu/fs/jbd2/commit.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/jbd2/commit.c	2020-01-04 07:34:38.000000000 -0500
@@ -740,7 +740,6 @@ start_journal_io:
 				submit_bh(WRITE_SYNC, bh);
 			}
 			cond_resched();
-			stats.run.rs_blocks_logged += bufs;
 
 			/* Force a new descriptor to be generated next
                            time round the loop. */
@@ -827,6 +826,7 @@ start_journal_io:
 		if (unlikely(!buffer_uptodate(bh)))
 			err = -EIO;
 		jbd2_unfile_log_bh(bh);
+		stats.run.rs_blocks_logged++;
 
 		/*
 		 * The list contains temporary buffer heads created by
@@ -872,6 +872,7 @@ start_journal_io:
 		BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile");
 		clear_buffer_jwrite(bh);
 		jbd2_unfile_log_bh(bh);
+		stats.run.rs_blocks_logged++;
 		__brelse(bh);		/* One for getblk */
 		/* AKPM: bforget here */
 	}
@@ -893,6 +894,7 @@ start_journal_io:
 	}
 	if (cbh)
 		err = journal_wait_on_commit_record(journal, cbh);
+	stats.run.rs_blocks_logged++;
 	if (jbd2_has_feature_async_commit(journal) &&
 	    journal->j_flags & JBD2_BARRIER) {
 		blkdev_issue_flush(journal->j_dev, GFP_NOFS, NULL);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/ocfs2/acl.c linux-libre-4.4.208-gnu/fs/ocfs2/acl.c
--- linux-libre-4.4.207-gnu/fs/ocfs2/acl.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/ocfs2/acl.c	2020-01-04 07:34:38.000000000 -0500
@@ -338,8 +338,8 @@ int ocfs2_acl_chmod(struct inode *inode,
 	down_read(&OCFS2_I(inode)->ip_xattr_sem);
 	acl = ocfs2_get_acl_nolock(inode, ACL_TYPE_ACCESS, bh);
 	up_read(&OCFS2_I(inode)->ip_xattr_sem);
-	if (IS_ERR(acl) || !acl)
-		return PTR_ERR(acl);
+	if (IS_ERR_OR_NULL(acl))
+		return PTR_ERR_OR_ZERO(acl);
 	ret = __posix_acl_chmod(&acl, GFP_KERNEL, inode->i_mode);
 	if (ret)
 		return ret;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/quota/dquot.c linux-libre-4.4.208-gnu/fs/quota/dquot.c
--- linux-libre-4.4.207-gnu/fs/quota/dquot.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/quota/dquot.c	2020-01-04 07:34:38.000000000 -0500
@@ -2783,68 +2783,73 @@ EXPORT_SYMBOL(dquot_quotactl_sysfile_ops
 static int do_proc_dqstats(struct ctl_table *table, int write,
 		     void __user *buffer, size_t *lenp, loff_t *ppos)
 {
-	unsigned int type = (int *)table->data - dqstats.stat;
+	unsigned int type = (unsigned long *)table->data - dqstats.stat;
+	s64 value = percpu_counter_sum(&dqstats.counter[type]);
+
+	/* Filter negative values for non-monotonic counters */
+	if (value < 0 && (type == DQST_ALLOC_DQUOTS ||
+			  type == DQST_FREE_DQUOTS))
+		value = 0;
 
 	/* Update global table */
-	dqstats.stat[type] =
-			percpu_counter_sum_positive(&dqstats.counter[type]);
-	return proc_dointvec(table, write, buffer, lenp, ppos);
+	dqstats.stat[type] = value;
+	return proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 }
 
 static struct ctl_table fs_dqstats_table[] = {
 	{
 		.procname	= "lookups",
 		.data		= &dqstats.stat[DQST_LOOKUPS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "drops",
 		.data		= &dqstats.stat[DQST_DROPS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "reads",
 		.data		= &dqstats.stat[DQST_READS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "writes",
 		.data		= &dqstats.stat[DQST_WRITES],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "cache_hits",
 		.data		= &dqstats.stat[DQST_CACHE_HITS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "allocated_dquots",
 		.data		= &dqstats.stat[DQST_ALLOC_DQUOTS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "free_dquots",
 		.data		= &dqstats.stat[DQST_FREE_DQUOTS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
 	{
 		.procname	= "syncs",
 		.data		= &dqstats.stat[DQST_SYNCS],
-		.maxlen		= sizeof(int),
+		.maxlen		= sizeof(unsigned long),
 		.mode		= 0444,
 		.proc_handler	= do_proc_dqstats,
 	},
diff -druNp --no-dereference linux-libre-4.4.207-gnu/fs/readdir.c linux-libre-4.4.208-gnu/fs/readdir.c
--- linux-libre-4.4.207-gnu/fs/readdir.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/fs/readdir.c	2020-01-04 07:34:38.000000000 -0500
@@ -51,6 +51,40 @@ out:
 EXPORT_SYMBOL(iterate_dir);
 
 /*
+ * POSIX says that a dirent name cannot contain NULL or a '/'.
+ *
+ * It's not 100% clear what we should really do in this case.
+ * The filesystem is clearly corrupted, but returning a hard
+ * error means that you now don't see any of the other names
+ * either, so that isn't a perfect alternative.
+ *
+ * And if you return an error, what error do you use? Several
+ * filesystems seem to have decided on EUCLEAN being the error
+ * code for EFSCORRUPTED, and that may be the error to use. Or
+ * just EIO, which is perhaps more obvious to users.
+ *
+ * In order to see the other file names in the directory, the
+ * caller might want to make this a "soft" error: skip the
+ * entry, and return the error at the end instead.
+ *
+ * Note that this should likely do a "memchr(name, 0, len)"
+ * check too, since that would be filesystem corruption as
+ * well. However, that case can't actually confuse user space,
+ * which has to do a strlen() on the name anyway to find the
+ * filename length, and the above "soft error" worry means
+ * that it's probably better left alone until we have that
+ * issue clarified.
+ */
+static int verify_dirent_name(const char *name, int len)
+{
+	if (!len)
+		return -EIO;
+	if (memchr(name, '/', len))
+		return -EIO;
+	return 0;
+}
+
+/*
  * Traditional linux readdir() handling..
  *
  * "count=1" is a special case, meaning that the buffer is one
@@ -159,6 +193,9 @@ static int filldir(struct dir_context *c
 	int reclen = ALIGN(offsetof(struct linux_dirent, d_name) + namlen + 2,
 		sizeof(long));
 
+	buf->error = verify_dirent_name(name, namlen);
+	if (unlikely(buf->error))
+		return buf->error;
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
@@ -243,6 +280,9 @@ static int filldir64(struct dir_context
 	int reclen = ALIGN(offsetof(struct linux_dirent64, d_name) + namlen + 1,
 		sizeof(u64));
 
+	buf->error = verify_dirent_name(name, namlen);
+	if (unlikely(buf->error))
+		return buf->error;
 	buf->error = -EINVAL;	/* only used if we fail.. */
 	if (reclen > buf->count)
 		return -EINVAL;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/drm/drm_dp_mst_helper.h linux-libre-4.4.208-gnu/include/drm/drm_dp_mst_helper.h
--- linux-libre-4.4.207-gnu/include/drm/drm_dp_mst_helper.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/drm/drm_dp_mst_helper.h	2020-01-04 07:34:38.000000000 -0500
@@ -303,7 +303,7 @@ struct drm_dp_resource_status_notify {
 
 struct drm_dp_query_payload_ack_reply {
 	u8 port_number;
-	u8 allocated_pbn;
+	u16 allocated_pbn;
 };
 
 struct drm_dp_sideband_msg_req_body {
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/linux/hrtimer.h linux-libre-4.4.208-gnu/include/linux/hrtimer.h
--- linux-libre-4.4.207-gnu/include/linux/hrtimer.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/linux/hrtimer.h	2020-01-04 07:34:38.000000000 -0500
@@ -424,12 +424,18 @@ extern u64 hrtimer_get_next_event(void);
 
 extern bool hrtimer_active(const struct hrtimer *timer);
 
-/*
- * Helper function to check, whether the timer is on one of the queues
+/**
+ * hrtimer_is_queued = check, whether the timer is on one of the queues
+ * @timer:	Timer to check
+ *
+ * Returns: True if the timer is queued, false otherwise
+ *
+ * The function can be used lockless, but it gives only a current snapshot.
  */
-static inline int hrtimer_is_queued(struct hrtimer *timer)
+static inline bool hrtimer_is_queued(struct hrtimer *timer)
 {
-	return timer->state & HRTIMER_STATE_ENQUEUED;
+	/* The READ_ONCE pairs with the update functions of timer->state */
+	return !!(READ_ONCE(timer->state) & HRTIMER_STATE_ENQUEUED);
 }
 
 /*
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/linux/libfdt_env.h linux-libre-4.4.208-gnu/include/linux/libfdt_env.h
--- linux-libre-4.4.207-gnu/include/linux/libfdt_env.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/linux/libfdt_env.h	2020-01-04 07:34:38.000000000 -0500
@@ -6,6 +6,9 @@
 
 #include <asm/byteorder.h>
 
+#define INT32_MAX	S32_MAX
+#define UINT32_MAX	U32_MAX
+
 typedef __be16 fdt16_t;
 typedef __be32 fdt32_t;
 typedef __be64 fdt64_t;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/linux/mod_devicetable.h linux-libre-4.4.208-gnu/include/linux/mod_devicetable.h
--- linux-libre-4.4.207-gnu/include/linux/mod_devicetable.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/linux/mod_devicetable.h	2020-01-04 07:34:38.000000000 -0500
@@ -502,9 +502,9 @@ struct platform_device_id {
 
 #define MDIO_MODULE_PREFIX	"mdio:"
 
-#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d"
+#define MDIO_ID_FMT "%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u%u"
 #define MDIO_ID_ARGS(_id) \
-	(_id)>>31, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1,	\
+	((_id)>>31) & 1, ((_id)>>30) & 1, ((_id)>>29) & 1, ((_id)>>28) & 1, \
 	((_id)>>27) & 1, ((_id)>>26) & 1, ((_id)>>25) & 1, ((_id)>>24) & 1, \
 	((_id)>>23) & 1, ((_id)>>22) & 1, ((_id)>>21) & 1, ((_id)>>20) & 1, \
 	((_id)>>19) & 1, ((_id)>>18) & 1, ((_id)>>17) & 1, ((_id)>>16) & 1, \
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/linux/quota.h linux-libre-4.4.208-gnu/include/linux/quota.h
--- linux-libre-4.4.207-gnu/include/linux/quota.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/linux/quota.h	2020-01-04 07:34:38.000000000 -0500
@@ -253,7 +253,7 @@ enum {
 };
 
 struct dqstats {
-	int stat[_DQST_DQSTAT_LAST];
+	unsigned long stat[_DQST_DQSTAT_LAST];
 	struct percpu_counter counter[_DQST_DQSTAT_LAST];
 };
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/net/dst.h linux-libre-4.4.208-gnu/include/net/dst.h
--- linux-libre-4.4.207-gnu/include/net/dst.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/net/dst.h	2020-01-04 07:34:38.000000000 -0500
@@ -113,7 +113,7 @@ struct dst_entry {
 struct dst_metrics {
 	u32		metrics[RTAX_MAX];
 	atomic_t	refcnt;
-};
+} __aligned(4);		/* Low pointer bits contain DST_METRICS_FLAGS */
 extern const struct dst_metrics dst_default_metrics;
 
 u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/include/scsi/iscsi_proto.h linux-libre-4.4.208-gnu/include/scsi/iscsi_proto.h
--- linux-libre-4.4.207-gnu/include/scsi/iscsi_proto.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/include/scsi/iscsi_proto.h	2020-01-04 07:34:38.000000000 -0500
@@ -638,6 +638,7 @@ struct iscsi_reject {
 #define ISCSI_REASON_BOOKMARK_INVALID	9
 #define ISCSI_REASON_BOOKMARK_NO_RESOURCES	10
 #define ISCSI_REASON_NEGOTIATION_RESET	11
+#define ISCSI_REASON_WAITING_FOR_LOGOUT	12
 
 /* Max. number of Key=Value pairs in a text message */
 #define MAX_KEY_VALUE_PAIRS	8192
diff -druNp --no-dereference linux-libre-4.4.207-gnu/kernel/sysctl.c linux-libre-4.4.208-gnu/kernel/sysctl.c
--- linux-libre-4.4.207-gnu/kernel/sysctl.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/kernel/sysctl.c	2020-01-04 07:34:38.000000000 -0500
@@ -1357,7 +1357,7 @@ static struct ctl_table vm_table[] = {
 		.procname	= "drop_caches",
 		.data		= &sysctl_drop_caches,
 		.maxlen		= sizeof(int),
-		.mode		= 0644,
+		.mode		= 0200,
 		.proc_handler	= drop_caches_sysctl_handler,
 		.extra1		= &one,
 		.extra2		= &four,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/kernel/time/hrtimer.c linux-libre-4.4.208-gnu/kernel/time/hrtimer.c
--- linux-libre-4.4.207-gnu/kernel/time/hrtimer.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/kernel/time/hrtimer.c	2020-01-04 07:34:38.000000000 -0500
@@ -887,7 +887,8 @@ static int enqueue_hrtimer(struct hrtime
 
 	base->cpu_base->active_bases |= 1 << base->index;
 
-	timer->state = HRTIMER_STATE_ENQUEUED;
+	/* Pairs with the lockless read in hrtimer_is_queued() */
+	WRITE_ONCE(timer->state, HRTIMER_STATE_ENQUEUED);
 
 	return timerqueue_add(&base->active, &timer->node);
 }
@@ -909,7 +910,8 @@ static void __remove_hrtimer(struct hrti
 	struct hrtimer_cpu_base *cpu_base = base->cpu_base;
 	u8 state = timer->state;
 
-	timer->state = newstate;
+	/* Pairs with the lockless read in hrtimer_is_queued() */
+	WRITE_ONCE(timer->state, newstate);
 	if (!(state & HRTIMER_STATE_ENQUEUED))
 		return;
 
@@ -936,8 +938,9 @@ static void __remove_hrtimer(struct hrti
 static inline int
 remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool restart)
 {
-	if (hrtimer_is_queued(timer)) {
-		u8 state = timer->state;
+	u8 state = timer->state;
+
+	if (state & HRTIMER_STATE_ENQUEUED) {
 		int reprogram;
 
 		/*
diff -druNp --no-dereference linux-libre-4.4.207-gnu/lib/dma-debug.c linux-libre-4.4.208-gnu/lib/dma-debug.c
--- linux-libre-4.4.207-gnu/lib/dma-debug.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/lib/dma-debug.c	2020-01-04 07:34:38.000000000 -0500
@@ -427,6 +427,7 @@ void debug_dma_dump_mappings(struct devi
 		}
 
 		spin_unlock_irqrestore(&bucket->lock, flags);
+		cond_resched();
 	}
 }
 EXPORT_SYMBOL(debug_dma_dump_mappings);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/Makefile linux-libre-4.4.208-gnu/Makefile
--- linux-libre-4.4.207-gnu/Makefile	2019-12-22 01:51:39.000000000 -0500
+++ linux-libre-4.4.208-gnu/Makefile	2020-01-04 12:27:26.000000000 -0500
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 207
+SUBLEVEL = 208
 EXTRAVERSION = -gnu
 NAME = Blurry Fish Butt
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/bluetooth/hci_core.c linux-libre-4.4.208-gnu/net/bluetooth/hci_core.c
--- linux-libre-4.4.207-gnu/net/bluetooth/hci_core.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/bluetooth/hci_core.c	2020-01-04 07:34:38.000000000 -0500
@@ -4459,7 +4459,14 @@ static void hci_rx_work(struct work_stru
 			hci_send_to_sock(hdev, skb);
 		}
 
-		if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL)) {
+		/* If the device has been opened in HCI_USER_CHANNEL,
+		 * the userspace has exclusive access to device.
+		 * When device is HCI_INIT, we still need to process
+		 * the data packets to the driver in order
+		 * to complete its setup().
+		 */
+		if (hci_dev_test_flag(hdev, HCI_USER_CHANNEL) &&
+		    !test_bit(HCI_INIT, &hdev->flags)) {
 			kfree_skb(skb);
 			continue;
 		}
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/bridge/br_netfilter_hooks.c linux-libre-4.4.208-gnu/net/bridge/br_netfilter_hooks.c
--- linux-libre-4.4.207-gnu/net/bridge/br_netfilter_hooks.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/bridge/br_netfilter_hooks.c	2020-01-04 07:34:38.000000000 -0500
@@ -638,6 +638,9 @@ static unsigned int br_nf_forward_arp(vo
 		nf_bridge_pull_encap_header(skb);
 	}
 
+	if (unlikely(!pskb_may_pull(skb, sizeof(struct arphdr))))
+		return NF_DROP;
+
 	if (arp_hdr(skb)->ar_pln != 4) {
 		if (IS_VLAN_ARP(skb))
 			nf_bridge_push_encap_header(skb);
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/bridge/netfilter/ebtables.c linux-libre-4.4.208-gnu/net/bridge/netfilter/ebtables.c
--- linux-libre-4.4.207-gnu/net/bridge/netfilter/ebtables.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/bridge/netfilter/ebtables.c	2020-01-04 07:34:38.000000000 -0500
@@ -1883,7 +1883,7 @@ static int ebt_buf_count(struct ebt_entr
 }
 
 static int ebt_buf_add(struct ebt_entries_buf_state *state,
-		       void *data, unsigned int sz)
+		       const void *data, unsigned int sz)
 {
 	if (state->buf_kern_start == NULL)
 		goto count_only;
@@ -1917,7 +1917,7 @@ enum compat_mwt {
 	EBT_COMPAT_TARGET,
 };
 
-static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
+static int compat_mtw_from_user(const struct compat_ebt_entry_mwt *mwt,
 				enum compat_mwt compat_mwt,
 				struct ebt_entries_buf_state *state,
 				const unsigned char *base)
@@ -1994,22 +1994,23 @@ static int compat_mtw_from_user(struct c
  * return size of all matches, watchers or target, including necessary
  * alignment and padding.
  */
-static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32,
+static int ebt_size_mwt(const struct compat_ebt_entry_mwt *match32,
 			unsigned int size_left, enum compat_mwt type,
 			struct ebt_entries_buf_state *state, const void *base)
 {
+	const char *buf = (const char *)match32;
 	int growth = 0;
-	char *buf;
 
 	if (size_left == 0)
 		return 0;
 
-	buf = (char *) match32;
-
-	while (size_left >= sizeof(*match32)) {
+	do {
 		struct ebt_entry_match *match_kern;
 		int ret;
 
+		if (size_left < sizeof(*match32))
+			return -EINVAL;
+
 		match_kern = (struct ebt_entry_match *) state->buf_kern_start;
 		if (match_kern) {
 			char *tmp;
@@ -2046,22 +2047,18 @@ static int ebt_size_mwt(struct compat_eb
 		if (match_kern)
 			match_kern->match_size = ret;
 
-		/* rule should have no remaining data after target */
-		if (type == EBT_COMPAT_TARGET && size_left)
-			return -EINVAL;
-
 		match32 = (struct compat_ebt_entry_mwt *) buf;
-	}
+	} while (size_left);
 
 	return growth;
 }
 
 /* called for all ebt_entry structures. */
-static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base,
+static int size_entry_mwt(const struct ebt_entry *entry, const unsigned char *base,
 			  unsigned int *total,
 			  struct ebt_entries_buf_state *state)
 {
-	unsigned int i, j, startoff, new_offset = 0;
+	unsigned int i, j, startoff, next_expected_off, new_offset = 0;
 	/* stores match/watchers/targets & offset of next struct ebt_entry: */
 	unsigned int offsets[4];
 	unsigned int *offsets_update = NULL;
@@ -2149,11 +2146,13 @@ static int size_entry_mwt(struct ebt_ent
 			return ret;
 	}
 
-	startoff = state->buf_user_offset - startoff;
+	next_expected_off = state->buf_user_offset - startoff;
+	if (next_expected_off != entry->next_offset)
+		return -EINVAL;
 
-	if (WARN_ON(*total < startoff))
+	if (*total < entry->next_offset)
 		return -EINVAL;
-	*total -= startoff;
+	*total -= entry->next_offset;
 	return 0;
 }
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/ipv4/icmp.c linux-libre-4.4.208-gnu/net/ipv4/icmp.c
--- linux-libre-4.4.207-gnu/net/ipv4/icmp.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/ipv4/icmp.c	2020-01-04 07:34:38.000000000 -0500
@@ -256,10 +256,11 @@ bool icmp_global_allow(void)
 	bool rc = false;
 
 	/* Check if token bucket is empty and cannot be refilled
-	 * without taking the spinlock.
+	 * without taking the spinlock. The READ_ONCE() are paired
+	 * with the following WRITE_ONCE() in this same function.
 	 */
-	if (!icmp_global.credit) {
-		delta = min_t(u32, now - icmp_global.stamp, HZ);
+	if (!READ_ONCE(icmp_global.credit)) {
+		delta = min_t(u32, now - READ_ONCE(icmp_global.stamp), HZ);
 		if (delta < HZ / 50)
 			return false;
 	}
@@ -269,14 +270,14 @@ bool icmp_global_allow(void)
 	if (delta >= HZ / 50) {
 		incr = sysctl_icmp_msgs_per_sec * delta / HZ ;
 		if (incr)
-			icmp_global.stamp = now;
+			WRITE_ONCE(icmp_global.stamp, now);
 	}
 	credit = min_t(u32, icmp_global.credit + incr, sysctl_icmp_msgs_burst);
 	if (credit) {
 		credit--;
 		rc = true;
 	}
-	icmp_global.credit = credit;
+	WRITE_ONCE(icmp_global.credit, credit);
 	spin_unlock(&icmp_global.lock);
 	return rc;
 }
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/ipv4/tcp_output.c linux-libre-4.4.208-gnu/net/ipv4/tcp_output.c
--- linux-libre-4.4.207-gnu/net/ipv4/tcp_output.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/ipv4/tcp_output.c	2020-01-04 07:34:38.000000000 -0500
@@ -2148,6 +2148,14 @@ static bool tcp_write_xmit(struct sock *
 				break;
 		}
 
+		/* Argh, we hit an empty skb(), presumably a thread
+		 * is sleeping in sendmsg()/sk_stream_wait_memory().
+		 * We do not want to send a pure-ack packet and have
+		 * a strange looking rtx queue with empty packet(s).
+		 */
+		if (TCP_SKB_CB(skb)->end_seq == TCP_SKB_CB(skb)->seq)
+			break;
+
 		if (unlikely(tcp_transmit_skb(sk, skb, 1, gfp)))
 			break;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/nfc/nci/uart.c linux-libre-4.4.208-gnu/net/nfc/nci/uart.c
--- linux-libre-4.4.207-gnu/net/nfc/nci/uart.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/nfc/nci/uart.c	2020-01-04 07:34:38.000000000 -0500
@@ -355,7 +355,7 @@ static int nci_uart_default_recv_buf(str
 			nu->rx_packet_len = -1;
 			nu->rx_skb = nci_skb_alloc(nu->ndev,
 						   NCI_MAX_PACKET_SIZE,
-						   GFP_KERNEL);
+						   GFP_ATOMIC);
 			if (!nu->rx_skb)
 				return -ENOMEM;
 		}
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/packet/af_packet.c linux-libre-4.4.208-gnu/net/packet/af_packet.c
--- linux-libre-4.4.207-gnu/net/packet/af_packet.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/packet/af_packet.c	2020-01-04 07:34:38.000000000 -0500
@@ -587,7 +587,8 @@ static int prb_calc_retire_blk_tmo(struc
 			msec = 1;
 			div = speed / 1000;
 		}
-	}
+	} else
+		return DEFAULT_PRB_RETIRE_TOV;
 
 	mbits = (blk_size_in_bytes * 8) / (1024 * 1024);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/net/sctp/protocol.c linux-libre-4.4.208-gnu/net/sctp/protocol.c
--- linux-libre-4.4.207-gnu/net/sctp/protocol.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/net/sctp/protocol.c	2020-01-04 07:34:38.000000000 -0500
@@ -255,6 +255,7 @@ static void sctp_v4_from_sk(union sctp_a
 	addr->v4.sin_family = AF_INET;
 	addr->v4.sin_port = 0;
 	addr->v4.sin_addr.s_addr = inet_sk(sk)->inet_rcv_saddr;
+	memset(addr->v4.sin_zero, 0, sizeof(addr->v4.sin_zero));
 }
 
 /* Initialize sk->sk_rcv_saddr from sctp_addr. */
@@ -277,6 +278,7 @@ static void sctp_v4_from_addr_param(unio
 	addr->v4.sin_family = AF_INET;
 	addr->v4.sin_port = port;
 	addr->v4.sin_addr.s_addr = param->v4.addr.s_addr;
+	memset(addr->v4.sin_zero, 0, sizeof(addr->v4.sin_zero));
 }
 
 /* Initialize an address parameter from a sctp_addr and return the length
@@ -301,6 +303,7 @@ static void sctp_v4_dst_saddr(union sctp
 	saddr->v4.sin_family = AF_INET;
 	saddr->v4.sin_port = port;
 	saddr->v4.sin_addr.s_addr = fl4->saddr;
+	memset(saddr->v4.sin_zero, 0, sizeof(saddr->v4.sin_zero));
 }
 
 /* Compare two addresses exactly. */
@@ -323,6 +326,7 @@ static void sctp_v4_inaddr_any(union sct
 	addr->v4.sin_family = AF_INET;
 	addr->v4.sin_addr.s_addr = htonl(INADDR_ANY);
 	addr->v4.sin_port = port;
+	memset(addr->v4.sin_zero, 0, sizeof(addr->v4.sin_zero));
 }
 
 /* Is this a wildcard address? */
diff -druNp --no-dereference linux-libre-4.4.207-gnu/samples/pktgen/functions.sh linux-libre-4.4.208-gnu/samples/pktgen/functions.sh
--- linux-libre-4.4.207-gnu/samples/pktgen/functions.sh	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/samples/pktgen/functions.sh	2020-01-04 07:34:38.000000000 -0500
@@ -5,6 +5,8 @@
 # Author: Jesper Dangaaard Brouer
 # License: GPL
 
+set -o errexit
+
 ## -- General shell logging cmds --
 function err() {
     local exitcode=$1
@@ -58,6 +60,7 @@ function pg_set() {
 function proc_cmd() {
     local result
     local proc_file=$1
+    local status=0
     # after shift, the remaining args are contained in $@
     shift
     local proc_ctrl=${PROC_DIR}/$proc_file
@@ -73,13 +76,13 @@ function proc_cmd() {
 	echo "cmd: $@ > $proc_ctrl"
     fi
     # Quoting of "$@" is important for space expansion
-    echo "$@" > "$proc_ctrl"
-    local status=$?
+    echo "$@" > "$proc_ctrl" || status=$?
 
-    result=$(grep "Result: OK:" $proc_ctrl)
-    # Due to pgctrl, cannot use exit code $? from grep
-    if [[ "$result" == "" ]]; then
-	grep "Result:" $proc_ctrl >&2
+    if [[ "$proc_file" != "pgctrl" ]]; then
+        result=$(grep "Result: OK:" $proc_ctrl) || true
+        if [[ "$result" == "" ]]; then
+            grep "Result:" $proc_ctrl >&2
+        fi
     fi
     if (( $status != 0 )); then
 	err 5 "Write error($status) occurred cmd: \"$@ > $proc_ctrl\""
@@ -105,6 +108,8 @@ function pgset() {
     fi
 }
 
+[[ $EUID -eq 0 ]] && trap 'pg_ctrl "reset"' EXIT
+
 ## -- General shell tricks --
 
 function root_check_run_with_sudo() {
diff -druNp --no-dereference linux-libre-4.4.207-gnu/scripts/kallsyms.c linux-libre-4.4.208-gnu/scripts/kallsyms.c
--- linux-libre-4.4.207-gnu/scripts/kallsyms.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/scripts/kallsyms.c	2020-01-04 07:34:38.000000000 -0500
@@ -455,6 +455,8 @@ static void build_initial_tok_table(void
 				table[pos] = table[i];
 			learn_symbol(table[pos].sym, table[pos].len);
 			pos++;
+		} else {
+			free(table[i].sym);
 		}
 	}
 	table_cnt = pos;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/sound/core/pcm_native.c linux-libre-4.4.208-gnu/sound/core/pcm_native.c
--- linux-libre-4.4.207-gnu/sound/core/pcm_native.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/sound/core/pcm_native.c	2020-01-04 07:34:38.000000000 -0500
@@ -587,6 +587,10 @@ static int snd_pcm_hw_params(struct snd_
 	while (runtime->boundary * 2 <= LONG_MAX - runtime->buffer_size)
 		runtime->boundary *= 2;
 
+	/* clear the buffer for avoiding possible kernel info leaks */
+	if (runtime->dma_area)
+		memset(runtime->dma_area, 0, runtime->dma_bytes);
+
 	snd_pcm_timer_resolution_change(substream);
 	snd_pcm_set_state(substream, SNDRV_PCM_STATE_SETUP);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/sound/pci/hda/hda_controller.c linux-libre-4.4.208-gnu/sound/pci/hda/hda_controller.c
--- linux-libre-4.4.207-gnu/sound/pci/hda/hda_controller.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/sound/pci/hda/hda_controller.c	2020-01-04 07:34:38.000000000 -0500
@@ -673,7 +673,7 @@ static int azx_rirb_get_response(struct
 		return -EAGAIN; /* give a chance to retry */
 	}
 
-	dev_WARN(chip->card->dev,
+	dev_err(chip->card->dev,
 		"azx_get_response timeout, switching to single_cmd mode: last cmd=0x%08x\n",
 		bus->last_cmd[addr]);
 	chip->single_cmd = 1;
diff -druNp --no-dereference linux-libre-4.4.207-gnu/sound/pci/hda/patch_ca0132.c linux-libre-4.4.208-gnu/sound/pci/hda/patch_ca0132.c
--- linux-libre-4.4.207-gnu/sound/pci/hda/patch_ca0132.c	2019-12-22 02:18:36.000000000 -0500
+++ linux-libre-4.4.208-gnu/sound/pci/hda/patch_ca0132.c	2020-01-04 12:53:32.000000000 -0500
@@ -1300,13 +1300,14 @@ struct scp_msg {
 
 static void dspio_clear_response_queue(struct hda_codec *codec)
 {
+	unsigned long timeout = jiffies + msecs_to_jiffies(1000);
 	unsigned int dummy = 0;
-	int status = -1;
+	int status;
 
 	/* clear all from the response queue */
 	do {
 		status = dspio_read(codec, &dummy);
-	} while (status == 0);
+	} while (status == 0 && time_before(jiffies, timeout));
 }
 
 static int dspio_get_response_data(struct hda_codec *codec)
@@ -4424,12 +4425,14 @@ static void ca0132_process_dsp_response(
 	struct ca0132_spec *spec = codec->spec;
 
 	codec_dbg(codec, "ca0132_process_dsp_response\n");
+	snd_hda_power_up_pm(codec);
 	if (spec->wait_scp) {
 		if (dspio_get_response_data(codec) >= 0)
 			spec->wait_scp = 0;
 	}
 
 	dspio_clear_response_queue(codec);
+	snd_hda_power_down_pm(codec);
 }
 
 static void hp_callback(struct hda_codec *codec, struct hda_jack_callback *cb)
diff -druNp --no-dereference linux-libre-4.4.207-gnu/sound/soc/codecs/rt5677.c linux-libre-4.4.208-gnu/sound/soc/codecs/rt5677.c
--- linux-libre-4.4.207-gnu/sound/soc/codecs/rt5677.c	2019-12-22 02:19:05.000000000 -0500
+++ linux-libre-4.4.208-gnu/sound/soc/codecs/rt5677.c	2020-01-04 12:54:03.000000000 -0500
@@ -295,6 +295,7 @@ static bool rt5677_volatile_register(str
 	case RT5677_I2C_MASTER_CTRL7:
 	case RT5677_I2C_MASTER_CTRL8:
 	case RT5677_HAP_GENE_CTRL2:
+	case RT5677_PWR_ANLG2: /* Modified by DSP firmware */
 	case RT5677_PWR_DSP_ST:
 	case RT5677_PRIV_DATA:
 	case RT5677_PLL1_CTRL2:
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/lib/traceevent/parse-filter.c linux-libre-4.4.208-gnu/tools/lib/traceevent/parse-filter.c
--- linux-libre-4.4.207-gnu/tools/lib/traceevent/parse-filter.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/lib/traceevent/parse-filter.c	2020-01-04 07:34:38.000000000 -0500
@@ -1484,8 +1484,10 @@ static int copy_filter_type(struct event
 	if (strcmp(str, "TRUE") == 0 || strcmp(str, "FALSE") == 0) {
 		/* Add trivial event */
 		arg = allocate_arg();
-		if (arg == NULL)
+		if (arg == NULL) {
+			free(str);
 			return -1;
+		}
 
 		arg->type = FILTER_ARG_BOOLEAN;
 		if (strcmp(str, "TRUE") == 0)
@@ -1494,8 +1496,11 @@ static int copy_filter_type(struct event
 			arg->boolean.value = 0;
 
 		filter_type = add_filter_type(filter, event->id);
-		if (filter_type == NULL)
+		if (filter_type == NULL) {
+			free(str);
+			free_arg(arg);
 			return -1;
+		}
 
 		filter_type->filter = arg;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/perf/builtin-report.c linux-libre-4.4.208-gnu/tools/perf/builtin-report.c
--- linux-libre-4.4.207-gnu/tools/perf/builtin-report.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/perf/builtin-report.c	2020-01-04 07:34:38.000000000 -0500
@@ -285,6 +285,13 @@ static int report__setup_sample_type(str
 				PERF_SAMPLE_BRANCH_ANY))
 		rep->nonany_branch_mode = true;
 
+#ifndef HAVE_LIBUNWIND_SUPPORT
+	if (dwarf_callchain_users) {
+		ui__warning("Please install libunwind development packages "
+			    "during the perf build.\n");
+	}
+#endif
+
 	return 0;
 }
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/perf/util/dwarf-aux.c linux-libre-4.4.208-gnu/tools/perf/util/dwarf-aux.c
--- linux-libre-4.4.207-gnu/tools/perf/util/dwarf-aux.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/perf/util/dwarf-aux.c	2020-01-04 07:34:38.000000000 -0500
@@ -294,20 +294,50 @@ bool die_is_func_def(Dwarf_Die *dw_die)
 }
 
 /**
+ * die_entrypc - Returns entry PC (the lowest address) of a DIE
+ * @dw_die: a DIE
+ * @addr: where to store entry PC
+ *
+ * Since dwarf_entrypc() does not return entry PC if the DIE has only address
+ * range, we have to use this to retrieve the lowest address from the address
+ * range attribute.
+ */
+int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr)
+{
+	Dwarf_Addr base, end;
+
+	if (!addr)
+		return -EINVAL;
+
+	if (dwarf_entrypc(dw_die, addr) == 0)
+		return 0;
+
+	return dwarf_ranges(dw_die, 0, &base, addr, &end) < 0 ? -ENOENT : 0;
+}
+
+/**
  * die_is_func_instance - Ensure that this DIE is an instance of a subprogram
  * @dw_die: a DIE
  *
  * Ensure that this DIE is an instance (which has an entry address).
- * This returns true if @dw_die is a function instance. If not, you need to
- * call die_walk_instances() to find actual instances.
+ * This returns true if @dw_die is a function instance. If not, the @dw_die
+ * must be a prototype. You can use die_walk_instances() to find actual
+ * instances.
  **/
 bool die_is_func_instance(Dwarf_Die *dw_die)
 {
 	Dwarf_Addr tmp;
+	Dwarf_Attribute attr_mem;
+	int tag = dwarf_tag(dw_die);
 
-	/* Actually gcc optimizes non-inline as like as inlined */
-	return !dwarf_func_inline(dw_die) && dwarf_entrypc(dw_die, &tmp) == 0;
+	if (tag != DW_TAG_subprogram &&
+	    tag != DW_TAG_inlined_subroutine)
+		return false;
+
+	return dwarf_entrypc(dw_die, &tmp) == 0 ||
+		dwarf_attr(dw_die, DW_AT_ranges, &attr_mem) != NULL;
 }
+
 /**
  * die_get_data_member_location - Get the data-member offset
  * @mb_die: a DIE of a member of a data structure
@@ -584,6 +614,9 @@ static int __die_walk_instances_cb(Dwarf
 	Dwarf_Die *origin;
 	int tmp;
 
+	if (!die_is_func_instance(inst))
+		return DIE_FIND_CB_CONTINUE;
+
 	attr = dwarf_attr(inst, DW_AT_abstract_origin, &attr_mem);
 	if (attr == NULL)
 		return DIE_FIND_CB_CONTINUE;
@@ -655,15 +688,14 @@ static int __die_walk_funclines_cb(Dwarf
 	if (dwarf_tag(in_die) == DW_TAG_inlined_subroutine) {
 		fname = die_get_call_file(in_die);
 		lineno = die_get_call_lineno(in_die);
-		if (fname && lineno > 0 && dwarf_entrypc(in_die, &addr) == 0) {
+		if (fname && lineno > 0 && die_entrypc(in_die, &addr) == 0) {
 			lw->retval = lw->callback(fname, lineno, addr, lw->data);
 			if (lw->retval != 0)
 				return DIE_FIND_CB_END;
 		}
+		if (!lw->recursive)
+			return DIE_FIND_CB_SIBLING;
 	}
-	if (!lw->recursive)
-		/* Don't need to search recursively */
-		return DIE_FIND_CB_SIBLING;
 
 	if (addr) {
 		fname = dwarf_decl_file(in_die);
@@ -696,7 +728,7 @@ static int __die_walk_funclines(Dwarf_Di
 	/* Handle function declaration line */
 	fname = dwarf_decl_file(sp_die);
 	if (fname && dwarf_decl_line(sp_die, &lineno) == 0 &&
-	    dwarf_entrypc(sp_die, &addr) == 0) {
+	    die_entrypc(sp_die, &addr) == 0) {
 		lw.retval = callback(fname, lineno, addr, data);
 		if (lw.retval != 0)
 			goto done;
@@ -710,6 +742,10 @@ static int __die_walk_culines_cb(Dwarf_D
 {
 	struct __line_walk_param *lw = data;
 
+	/*
+	 * Since inlined function can include another inlined function in
+	 * the same file, we need to walk in it recursively.
+	 */
 	lw->retval = __die_walk_funclines(sp_die, true, lw->callback, lw->data);
 	if (lw->retval != 0)
 		return DWARF_CB_ABORT;
@@ -734,11 +770,12 @@ int die_walk_lines(Dwarf_Die *rt_die, li
 	Dwarf_Lines *lines;
 	Dwarf_Line *line;
 	Dwarf_Addr addr;
-	const char *fname, *decf = NULL;
+	const char *fname, *decf = NULL, *inf = NULL;
 	int lineno, ret = 0;
 	int decl = 0, inl;
 	Dwarf_Die die_mem, *cu_die;
 	size_t nlines, i;
+	bool flag;
 
 	/* Get the CU die */
 	if (dwarf_tag(rt_die) != DW_TAG_compile_unit) {
@@ -769,6 +806,12 @@ int die_walk_lines(Dwarf_Die *rt_die, li
 				  "Possible error in debuginfo.\n");
 			continue;
 		}
+		/* Skip end-of-sequence */
+		if (dwarf_lineendsequence(line, &flag) != 0 || flag)
+			continue;
+		/* Skip Non statement line-info */
+		if (dwarf_linebeginstatement(line, &flag) != 0 || !flag)
+			continue;
 		/* Filter lines based on address */
 		if (rt_die != cu_die) {
 			/*
@@ -778,13 +821,21 @@ int die_walk_lines(Dwarf_Die *rt_die, li
 			 */
 			if (!dwarf_haspc(rt_die, addr))
 				continue;
+
 			if (die_find_inlinefunc(rt_die, addr, &die_mem)) {
+				/* Call-site check */
+				inf = die_get_call_file(&die_mem);
+				if ((inf && !strcmp(inf, decf)) &&
+				    die_get_call_lineno(&die_mem) == lineno)
+					goto found;
+
 				dwarf_decl_line(&die_mem, &inl);
 				if (inl != decl ||
 				    decf != dwarf_decl_file(&die_mem))
 					continue;
 			}
 		}
+found:
 		/* Get source line */
 		fname = dwarf_linesrc(line, NULL, NULL);
 
@@ -799,8 +850,9 @@ int die_walk_lines(Dwarf_Die *rt_die, li
 	 */
 	if (rt_die != cu_die)
 		/*
-		 * Don't need walk functions recursively, because nested
-		 * inlined functions don't have lines of the specified DIE.
+		 * Don't need walk inlined functions recursively, because
+		 * inner inlined functions don't have the lines of the
+		 * specified function.
 		 */
 		ret = __die_walk_funclines(rt_die, false, callback, data);
 	else {
@@ -981,7 +1033,7 @@ static int die_get_var_innermost_scope(D
 	bool first = true;
 	const char *name;
 
-	ret = dwarf_entrypc(sp_die, &entry);
+	ret = die_entrypc(sp_die, &entry);
 	if (ret)
 		return ret;
 
@@ -1042,7 +1094,7 @@ int die_get_var_range(Dwarf_Die *sp_die,
 	bool first = true;
 	const char *name;
 
-	ret = dwarf_entrypc(sp_die, &entry);
+	ret = die_entrypc(sp_die, &entry);
 	if (ret)
 		return ret;
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/perf/util/dwarf-aux.h linux-libre-4.4.208-gnu/tools/perf/util/dwarf-aux.h
--- linux-libre-4.4.207-gnu/tools/perf/util/dwarf-aux.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/perf/util/dwarf-aux.h	2020-01-04 07:34:38.000000000 -0500
@@ -38,6 +38,9 @@ extern int cu_find_lineinfo(Dwarf_Die *c
 extern int cu_walk_functions_at(Dwarf_Die *cu_die, Dwarf_Addr addr,
 			int (*callback)(Dwarf_Die *, void *), void *data);
 
+/* Get the lowest PC in DIE (including range list) */
+int die_entrypc(Dwarf_Die *dw_die, Dwarf_Addr *addr);
+
 /* Ensure that this DIE is a subprogram and definition (not declaration) */
 extern bool die_is_func_def(Dwarf_Die *dw_die);
 
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/perf/util/perf_regs.h linux-libre-4.4.208-gnu/tools/perf/util/perf_regs.h
--- linux-libre-4.4.207-gnu/tools/perf/util/perf_regs.h	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/perf/util/perf_regs.h	2020-01-04 07:34:38.000000000 -0500
@@ -26,7 +26,7 @@ int perf_reg_value(u64 *valp, struct reg
 
 static inline const char *perf_reg_name(int id __maybe_unused)
 {
-	return NULL;
+	return "unknown";
 }
 
 static inline int perf_reg_value(u64 *valp __maybe_unused,
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/perf/util/probe-finder.c linux-libre-4.4.208-gnu/tools/perf/util/probe-finder.c
--- linux-libre-4.4.207-gnu/tools/perf/util/probe-finder.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/perf/util/probe-finder.c	2020-01-04 07:34:38.000000000 -0500
@@ -746,6 +746,16 @@ static int find_best_scope_cb(Dwarf_Die
 	return 0;
 }
 
+/* Return innermost DIE */
+static int find_inner_scope_cb(Dwarf_Die *fn_die, void *data)
+{
+	struct find_scope_param *fsp = data;
+
+	memcpy(fsp->die_mem, fn_die, sizeof(Dwarf_Die));
+	fsp->found = true;
+	return 1;
+}
+
 /* Find an appropriate scope fits to given conditions */
 static Dwarf_Die *find_best_scope(struct probe_finder *pf, Dwarf_Die *die_mem)
 {
@@ -757,8 +767,13 @@ static Dwarf_Die *find_best_scope(struct
 		.die_mem = die_mem,
 		.found = false,
 	};
+	int ret;
 
-	cu_walk_functions_at(&pf->cu_die, pf->addr, find_best_scope_cb, &fsp);
+	ret = cu_walk_functions_at(&pf->cu_die, pf->addr, find_best_scope_cb,
+				   &fsp);
+	if (!ret && !fsp.found)
+		cu_walk_functions_at(&pf->cu_die, pf->addr,
+				     find_inner_scope_cb, &fsp);
 
 	return fsp.found ? die_mem : NULL;
 }
@@ -900,7 +915,7 @@ static int probe_point_inline_cb(Dwarf_D
 		ret = find_probe_point_lazy(in_die, pf);
 	else {
 		/* Get probe address */
-		if (dwarf_entrypc(in_die, &addr) != 0) {
+		if (die_entrypc(in_die, &addr) != 0) {
 			pr_warning("Failed to get entry address of %s.\n",
 				   dwarf_diename(in_die));
 			return -ENOENT;
@@ -1331,6 +1346,18 @@ static int collect_variables_cb(Dwarf_Di
 		return DIE_FIND_CB_SIBLING;
 }
 
+static bool available_var_finder_overlap(struct available_var_finder *af)
+{
+	int i;
+
+	for (i = 0; i < af->nvls; i++) {
+		if (af->pf.addr == af->vls[i].point.address)
+			return true;
+	}
+	return false;
+
+}
+
 /* Add a found vars into available variables list */
 static int add_available_vars(Dwarf_Die *sc_die, struct probe_finder *pf)
 {
@@ -1341,6 +1368,14 @@ static int add_available_vars(Dwarf_Die
 	Dwarf_Die die_mem;
 	int ret;
 
+	/*
+	 * For some reason (e.g. different column assigned to same address),
+	 * this callback can be called with the address which already passed.
+	 * Ignore it first.
+	 */
+	if (available_var_finder_overlap(af))
+		return 0;
+
 	/* Check number of tevs */
 	if (af->nvls == af->max_vls) {
 		pr_warning("Too many( > %d) probe point found.\n", af->max_vls);
@@ -1481,7 +1516,7 @@ int debuginfo__find_probe_point(struct d
 		/* Get function entry information */
 		func = basefunc = dwarf_diename(&spdie);
 		if (!func ||
-		    dwarf_entrypc(&spdie, &baseaddr) != 0 ||
+		    die_entrypc(&spdie, &baseaddr) != 0 ||
 		    dwarf_decl_line(&spdie, &baseline) != 0) {
 			lineno = 0;
 			goto post;
@@ -1498,7 +1533,7 @@ int debuginfo__find_probe_point(struct d
 		while (die_find_top_inlinefunc(&spdie, (Dwarf_Addr)addr,
 						&indie)) {
 			/* There is an inline function */
-			if (dwarf_entrypc(&indie, &_addr) == 0 &&
+			if (die_entrypc(&indie, &_addr) == 0 &&
 			    _addr == addr) {
 				/*
 				 * addr is at an inline function entry.
diff -druNp --no-dereference linux-libre-4.4.207-gnu/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c linux-libre-4.4.208-gnu/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c
--- linux-libre-4.4.207-gnu/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c	2019-12-21 04:35:48.000000000 -0500
+++ linux-libre-4.4.208-gnu/tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c	2020-01-04 07:34:38.000000000 -0500
@@ -40,7 +40,6 @@ static cstate_t hsw_ext_cstates[HSW_EXT_
 	{
 		.name			= "PC9",
 		.desc			= N_("Processor Package C9"),
-		.desc			= N_("Processor Package C2"),
 		.id			= PC9,
 		.range			= RANGE_PACKAGE,
 		.get_count_percent	= hsw_ext_get_count_percent,
