diff -druNp --no-dereference linux-libre-4.14.159-gnu/arch/arm/boot/dts/s3c6410-mini6410.dts linux-libre-4.14.160-gnu/arch/arm/boot/dts/s3c6410-mini6410.dts
--- linux-libre-4.14.159-gnu/arch/arm/boot/dts/s3c6410-mini6410.dts	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/arch/arm/boot/dts/s3c6410-mini6410.dts	2019-12-21 04:47:56.000000000 -0500
@@ -167,6 +167,10 @@
 	};
 };
 
+&clocks {
+	clocks = <&fin_pll>;
+};
+
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/arch/arm/boot/dts/s3c6410-smdk6410.dts linux-libre-4.14.160-gnu/arch/arm/boot/dts/s3c6410-smdk6410.dts
--- linux-libre-4.14.159-gnu/arch/arm/boot/dts/s3c6410-smdk6410.dts	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/arch/arm/boot/dts/s3c6410-smdk6410.dts	2019-12-21 04:47:56.000000000 -0500
@@ -71,6 +71,10 @@
 	};
 };
 
+&clocks {
+	clocks = <&fin_pll>;
+};
+
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&sd0_clk>, <&sd0_cmd>, <&sd0_cd>, <&sd0_bus4>;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/arch/arm/mach-tegra/reset-handler.S linux-libre-4.14.160-gnu/arch/arm/mach-tegra/reset-handler.S
--- linux-libre-4.14.159-gnu/arch/arm/mach-tegra/reset-handler.S	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/arch/arm/mach-tegra/reset-handler.S	2019-12-21 04:47:56.000000000 -0500
@@ -56,16 +56,16 @@ ENTRY(tegra_resume)
 	cmp	r6, #TEGRA20
 	beq	1f				@ Yes
 	/* Clear the flow controller flags for this CPU. */
-	cpu_to_csr_reg r1, r0
+	cpu_to_csr_reg r3, r0
 	mov32	r2, TEGRA_FLOW_CTRL_BASE
-	ldr	r1, [r2, r1]
+	ldr	r1, [r2, r3]
 	/* Clear event & intr flag */
 	orr	r1, r1, \
 		#FLOW_CTRL_CSR_INTR_FLAG | FLOW_CTRL_CSR_EVENT_FLAG
 	movw	r0, #0x3FFD	@ enable, cluster_switch, immed, bitmaps
 				@ & ext flags for CPU power mgnt
 	bic	r1, r1, r0
-	str	r1, [r2]
+	str	r1, [r2, r3]
 1:
 
 	mov32	r9, 0xc09
diff -druNp --no-dereference linux-libre-4.14.159-gnu/arch/xtensa/mm/tlb.c linux-libre-4.14.160-gnu/arch/xtensa/mm/tlb.c
--- linux-libre-4.14.159-gnu/arch/xtensa/mm/tlb.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/arch/xtensa/mm/tlb.c	2019-12-21 04:47:56.000000000 -0500
@@ -218,6 +218,8 @@ static int check_tlb_entry(unsigned w, u
 	unsigned tlbidx = w | (e << PAGE_SHIFT);
 	unsigned r0 = dtlb ?
 		read_dtlb_virtual(tlbidx) : read_itlb_virtual(tlbidx);
+	unsigned r1 = dtlb ?
+		read_dtlb_translation(tlbidx) : read_itlb_translation(tlbidx);
 	unsigned vpn = (r0 & PAGE_MASK) | (e << PAGE_SHIFT);
 	unsigned pte = get_pte_for_vaddr(vpn);
 	unsigned mm_asid = (get_rasid_register() >> 8) & ASID_MASK;
@@ -233,8 +235,6 @@ static int check_tlb_entry(unsigned w, u
 	}
 
 	if (tlb_asid == mm_asid) {
-		unsigned r1 = dtlb ? read_dtlb_translation(tlbidx) :
-			read_itlb_translation(tlbidx);
 		if ((pte ^ r1) & PAGE_MASK) {
 			pr_err("%cTLB: way: %u, entry: %u, mapping: %08x->%08x, PTE: %08x\n",
 					dtlb ? 'D' : 'I', w, e, r0, r1, pte);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/dma-buf/sync_file.c linux-libre-4.14.160-gnu/drivers/dma-buf/sync_file.c
--- linux-libre-4.14.159-gnu/drivers/dma-buf/sync_file.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/dma-buf/sync_file.c	2019-12-21 04:47:56.000000000 -0500
@@ -230,7 +230,7 @@ static struct sync_file *sync_file_merge
 	a_fences = get_fences(a, &a_num_fences);
 	b_fences = get_fences(b, &b_num_fences);
 	if (a_num_fences > INT_MAX - b_num_fences)
-		return NULL;
+		goto err;
 
 	num_fences = a_num_fences + b_num_fences;
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/gpu/drm/radeon/r100.c linux-libre-4.14.160-gnu/drivers/gpu/drm/radeon/r100.c
--- linux-libre-4.14.159-gnu/drivers/gpu/drm/radeon/r100.c	2019-12-17 20:40:16.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/gpu/drm/radeon/r100.c	2019-12-22 00:03:12.000000000 -0500
@@ -1814,8 +1814,8 @@ static int r100_packet0_check(struct rad
 			track->textures[i].use_pitch = 1;
 		} else {
 			track->textures[i].use_pitch = 0;
-			track->textures[i].width = 1 << ((idx_value >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK);
-			track->textures[i].height = 1 << ((idx_value >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK);
+			track->textures[i].width = 1 << ((idx_value & RADEON_TXFORMAT_WIDTH_MASK) >> RADEON_TXFORMAT_WIDTH_SHIFT);
+			track->textures[i].height = 1 << ((idx_value & RADEON_TXFORMAT_HEIGHT_MASK) >> RADEON_TXFORMAT_HEIGHT_SHIFT);
 		}
 		if (idx_value & RADEON_TXFORMAT_CUBIC_MAP_ENABLE)
 			track->textures[i].tex_coord_type = 2;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/gpu/drm/radeon/r200.c linux-libre-4.14.160-gnu/drivers/gpu/drm/radeon/r200.c
--- linux-libre-4.14.159-gnu/drivers/gpu/drm/radeon/r200.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/gpu/drm/radeon/r200.c	2019-12-21 04:47:56.000000000 -0500
@@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_
 			track->textures[i].use_pitch = 1;
 		} else {
 			track->textures[i].use_pitch = 0;
-			track->textures[i].width = 1 << ((idx_value >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK);
-			track->textures[i].height = 1 << ((idx_value >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK);
+			track->textures[i].width = 1 << ((idx_value & RADEON_TXFORMAT_WIDTH_MASK) >> RADEON_TXFORMAT_WIDTH_SHIFT);
+			track->textures[i].height = 1 << ((idx_value & RADEON_TXFORMAT_HEIGHT_MASK) >> RADEON_TXFORMAT_HEIGHT_SHIFT);
 		}
 		if (idx_value & R200_TXFORMAT_LOOKUP_DISABLE)
 			track->textures[i].lookup_disable = true;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/md/persistent-data/dm-btree-remove.c linux-libre-4.14.160-gnu/drivers/md/persistent-data/dm-btree-remove.c
--- linux-libre-4.14.159-gnu/drivers/md/persistent-data/dm-btree-remove.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/md/persistent-data/dm-btree-remove.c	2019-12-21 04:47:56.000000000 -0500
@@ -203,7 +203,13 @@ static void __rebalance2(struct dm_btree
 	struct btree_node *right = r->n;
 	uint32_t nr_left = le32_to_cpu(left->header.nr_entries);
 	uint32_t nr_right = le32_to_cpu(right->header.nr_entries);
-	unsigned threshold = 2 * merge_threshold(left) + 1;
+	/*
+	 * Ensure the number of entries in each child will be greater
+	 * than or equal to (max_entries / 3 + 1), so no matter which
+	 * child is used for removal, the number will still be not
+	 * less than (max_entries / 3).
+	 */
+	unsigned int threshold = 2 * (merge_threshold(left) + 1);
 
 	if (nr_left + nr_right < threshold) {
 		/*
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/cavium/thunder/thunder_bgx.c linux-libre-4.14.160-gnu/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/cavium/thunder/thunder_bgx.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/cavium/thunder/thunder_bgx.c	2019-12-21 04:47:56.000000000 -0500
@@ -915,7 +915,7 @@ static int bgx_lmac_enable(struct bgx *b
 				       phy_interface_mode(lmac->lmac_type)))
 			return -ENODEV;
 
-		phy_start_aneg(lmac->phydev);
+		phy_start(lmac->phydev);
 		return 0;
 	}
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/common.h linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/common.h
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/common.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/common.h	2019-12-21 04:47:56.000000000 -0500
@@ -367,7 +367,7 @@ struct dma_features {
 struct stmmac_desc_ops {
 	/* DMA RX descriptor ring initialization */
 	void (*init_rx_desc) (struct dma_desc *p, int disable_rx_ic, int mode,
-			      int end);
+			      int end, int bfsize);
 	/* DMA TX descriptor ring initialization */
 	void (*init_tx_desc) (struct dma_desc *p, int mode, int end);
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/descs_com.h linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/descs_com.h
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/descs_com.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/descs_com.h	2019-12-21 04:47:56.000000000 -0500
@@ -29,11 +29,13 @@
 /* Specific functions used for Ring mode */
 
 /* Enhanced descriptors */
-static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end)
+static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end,
+					   int bfsize)
 {
-	p->des1 |= cpu_to_le32((BUF_SIZE_8KiB
-			<< ERDES1_BUFFER2_SIZE_SHIFT)
-		   & ERDES1_BUFFER2_SIZE_MASK);
+	if (bfsize == BUF_SIZE_16KiB)
+		p->des1 |= cpu_to_le32((BUF_SIZE_8KiB
+				<< ERDES1_BUFFER2_SIZE_SHIFT)
+			   & ERDES1_BUFFER2_SIZE_MASK);
 
 	if (end)
 		p->des1 |= cpu_to_le32(ERDES1_END_RING);
@@ -59,11 +61,15 @@ static inline void enh_set_tx_desc_len_o
 }
 
 /* Normal descriptors */
-static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end)
+static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end, int bfsize)
 {
-	p->des1 |= cpu_to_le32(((BUF_SIZE_2KiB - 1)
-				<< RDES1_BUFFER2_SIZE_SHIFT)
-		    & RDES1_BUFFER2_SIZE_MASK);
+	if (bfsize >= BUF_SIZE_2KiB) {
+		int bfsize2;
+
+		bfsize2 = min(bfsize - BUF_SIZE_2KiB + 1, BUF_SIZE_2KiB - 1);
+		p->des1 |= cpu_to_le32((bfsize2 << RDES1_BUFFER2_SIZE_SHIFT)
+			    & RDES1_BUFFER2_SIZE_MASK);
+	}
 
 	if (end)
 		p->des1 |= cpu_to_le32(RDES1_END_RING);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	2019-12-21 04:47:56.000000000 -0500
@@ -293,7 +293,7 @@ exit:
 }
 
 static void dwmac4_rd_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-				   int mode, int end)
+				   int mode, int end, int bfsize)
 {
 	p->des3 = cpu_to_le32(RDES3_OWN | RDES3_BUFFER1_VALID_ADDR);
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/enh_desc.c linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/enh_desc.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/enh_desc.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/enh_desc.c	2019-12-21 04:47:56.000000000 -0500
@@ -265,15 +265,19 @@ static int enh_desc_get_rx_status(void *
 }
 
 static void enh_desc_init_rx_desc(struct dma_desc *p, int disable_rx_ic,
-				  int mode, int end)
+				  int mode, int end, int bfsize)
 {
+	int bfsize1;
+
 	p->des0 |= cpu_to_le32(RDES0_OWN);
-	p->des1 |= cpu_to_le32(BUF_SIZE_8KiB & ERDES1_BUFFER1_SIZE_MASK);
+
+	bfsize1 = min(bfsize, BUF_SIZE_8KiB);
+	p->des1 |= cpu_to_le32(bfsize1 & ERDES1_BUFFER1_SIZE_MASK);
 
 	if (mode == STMMAC_CHAIN_MODE)
 		ehn_desc_rx_set_on_chain(p);
 	else
-		ehn_desc_rx_set_on_ring(p, end);
+		ehn_desc_rx_set_on_ring(p, end, bfsize);
 
 	if (disable_rx_ic)
 		p->des1 |= cpu_to_le32(ERDES1_DISABLE_IC);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/norm_desc.c linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/norm_desc.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/norm_desc.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/norm_desc.c	2019-12-21 04:47:56.000000000 -0500
@@ -133,15 +133,19 @@ static int ndesc_get_rx_status(void *dat
 }
 
 static void ndesc_init_rx_desc(struct dma_desc *p, int disable_rx_ic, int mode,
-			       int end)
+			       int end, int bfsize)
 {
+	int bfsize1;
+
 	p->des0 |= cpu_to_le32(RDES0_OWN);
-	p->des1 |= cpu_to_le32((BUF_SIZE_2KiB - 1) & RDES1_BUFFER1_SIZE_MASK);
+
+	bfsize1 = min(bfsize, BUF_SIZE_2KiB - 1);
+	p->des1 |= cpu_to_le32(bfsize1 & RDES1_BUFFER1_SIZE_MASK);
 
 	if (mode == STMMAC_CHAIN_MODE)
 		ndesc_rx_set_on_chain(p, end);
 	else
-		ndesc_rx_set_on_ring(p, end);
+		ndesc_rx_set_on_ring(p, end, bfsize);
 
 	if (disable_rx_ic)
 		p->des1 |= cpu_to_le32(RDES1_DISABLE_IC);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	2019-12-21 04:47:56.000000000 -0500
@@ -1072,11 +1072,13 @@ static void stmmac_clear_rx_descriptors(
 		if (priv->extend_desc)
 			priv->hw->desc->init_rx_desc(&rx_q->dma_erx[i].basic,
 						     priv->use_riwt, priv->mode,
-						     (i == DMA_RX_SIZE - 1));
+						     (i == DMA_RX_SIZE - 1),
+						     priv->dma_buf_sz);
 		else
 			priv->hw->desc->init_rx_desc(&rx_q->dma_rx[i],
 						     priv->use_riwt, priv->mode,
-						     (i == DMA_RX_SIZE - 1));
+						     (i == DMA_RX_SIZE - 1),
+						     priv->dma_buf_sz);
 }
 
 /**
@@ -3299,7 +3301,7 @@ static inline void stmmac_rx_refill(stru
 		dma_wmb();
 
 		if (unlikely(priv->synopsys_id >= DWMAC_CORE_4_00))
-			priv->hw->desc->init_rx_desc(p, priv->use_riwt, 0, 0);
+			priv->hw->desc->init_rx_desc(p, priv->use_riwt, 0, 0, priv->dma_buf_sz);
 		else
 			priv->hw->desc->set_rx_owner(p);
 
@@ -3321,9 +3323,8 @@ static inline void stmmac_rx_refill(stru
 static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue)
 {
 	struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
-	unsigned int entry = rx_q->cur_rx;
 	int coe = priv->hw->rx_csum;
-	unsigned int next_entry;
+	unsigned int next_entry = rx_q->cur_rx;
 	unsigned int count = 0;
 
 	if (netif_msg_rx_status(priv)) {
@@ -3338,10 +3339,12 @@ static int stmmac_rx(struct stmmac_priv
 		priv->hw->desc->display_ring(rx_head, DMA_RX_SIZE, true);
 	}
 	while (count < limit) {
-		int status;
+		int entry, status;
 		struct dma_desc *p;
 		struct dma_desc *np;
 
+		entry = next_entry;
+
 		if (priv->extend_desc)
 			p = (struct dma_desc *)(rx_q->dma_erx + entry);
 		else
@@ -3408,7 +3411,7 @@ static int stmmac_rx(struct stmmac_priv
 						   "len %d larger than size (%d)\n",
 						   frame_len, priv->dma_buf_sz);
 				priv->dev->stats.rx_length_errors++;
-				break;
+				continue;
 			}
 
 			/* ACS is set; GMAC core strips PAD/FCS for IEEE 802.3
@@ -3444,7 +3447,7 @@ static int stmmac_rx(struct stmmac_priv
 						dev_warn(priv->device,
 							 "packet dropped\n");
 					priv->dev->stats.rx_dropped++;
-					break;
+					continue;
 				}
 
 				dma_sync_single_for_cpu(priv->device,
@@ -3469,7 +3472,7 @@ static int stmmac_rx(struct stmmac_priv
 							   "%s: Inconsistent Rx chain\n",
 							   priv->dev->name);
 					priv->dev->stats.rx_dropped++;
-					break;
+					continue;
 				}
 				prefetch(skb->data - NET_IP_ALIGN);
 				rx_q->rx_skbuff[entry] = NULL;
@@ -3504,7 +3507,6 @@ static int stmmac_rx(struct stmmac_priv
 			priv->dev->stats.rx_packets++;
 			priv->dev->stats.rx_bytes += frame_len;
 		}
-		entry = next_entry;
 	}
 
 	stmmac_rx_refill(priv, queue);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/net/ethernet/ti/cpsw.c linux-libre-4.14.160-gnu/drivers/net/ethernet/ti/cpsw.c
--- linux-libre-4.14.159-gnu/drivers/net/ethernet/ti/cpsw.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/net/ethernet/ti/cpsw.c	2019-12-21 04:47:56.000000000 -0500
@@ -862,8 +862,8 @@ static irqreturn_t cpsw_rx_interrupt(int
 {
 	struct cpsw_common *cpsw = dev_id;
 
-	cpdma_ctlr_eoi(cpsw->dma, CPDMA_EOI_RX);
 	writel(0, &cpsw->wr_regs->rx_en);
+	cpdma_ctlr_eoi(cpsw->dma, CPDMA_EOI_RX);
 
 	if (cpsw->quirk_irq) {
 		disable_irq_nosync(cpsw->irqs_table[0]);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/nvme/host/core.c linux-libre-4.14.160-gnu/drivers/nvme/host/core.c
--- linux-libre-4.14.159-gnu/drivers/nvme/host/core.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/nvme/host/core.c	2019-12-21 04:47:56.000000000 -0500
@@ -1331,7 +1331,7 @@ static int nvme_pr_reserve(struct block_
 static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new,
 		enum pr_type type, bool abort)
 {
-	u32 cdw10 = nvme_pr_type(type) << 8 | abort ? 2 : 1;
+	u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1);
 	return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire);
 }
 
@@ -1343,7 +1343,7 @@ static int nvme_pr_clear(struct block_de
 
 static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type)
 {
-	u32 cdw10 = nvme_pr_type(type) << 8 | key ? 1 << 3 : 0;
+	u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0);
 	return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release);
 }
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/pci/msi.c linux-libre-4.14.160-gnu/drivers/pci/msi.c
--- linux-libre-4.14.159-gnu/drivers/pci/msi.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/pci/msi.c	2019-12-21 04:47:56.000000000 -0500
@@ -211,7 +211,7 @@ u32 __pci_msix_desc_mask_irq(struct msi_
 		return 0;
 
 	mask_bits &= ~PCI_MSIX_ENTRY_CTRL_MASKBIT;
-	if (flag)
+	if (flag & PCI_MSIX_ENTRY_CTRL_MASKBIT)
 		mask_bits |= PCI_MSIX_ENTRY_CTRL_MASKBIT;
 	writel(mask_bits, pci_msix_desc_addr(desc) + PCI_MSIX_ENTRY_VECTOR_CTRL);
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/pci/pci-driver.c linux-libre-4.14.160-gnu/drivers/pci/pci-driver.c
--- linux-libre-4.14.159-gnu/drivers/pci/pci-driver.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/pci/pci-driver.c	2019-12-21 04:47:56.000000000 -0500
@@ -967,17 +967,22 @@ static int pci_pm_thaw_noirq(struct devi
 			return error;
 	}
 
-	if (pci_has_legacy_pm_support(pci_dev))
-		return pci_legacy_resume_early(dev);
-
 	/*
-	 * pci_restore_state() requires the device to be in D0 (because of MSI
-	 * restoration among other things), so force it into D0 in case the
-	 * driver's "freeze" callbacks put it into a low-power state directly.
+	 * Both the legacy ->resume_early() and the new pm->thaw_noirq()
+	 * callbacks assume the device has been returned to D0 and its
+	 * config state has been restored.
+	 *
+	 * In addition, pci_restore_state() restores MSI-X state in MMIO
+	 * space, which requires the device to be in D0, so return it to D0
+	 * in case the driver's "freeze" callbacks put it into a low-power
+	 * state.
 	 */
 	pci_set_power_state(pci_dev, PCI_D0);
 	pci_restore_state(pci_dev);
 
+	if (pci_has_legacy_pm_support(pci_dev))
+		return pci_legacy_resume_early(dev);
+
 	if (drv && drv->pm && drv->pm->thaw_noirq)
 		error = drv->pm->thaw_noirq(dev);
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/pci/quirks.c linux-libre-4.14.160-gnu/drivers/pci/quirks.c
--- linux-libre-4.14.159-gnu/drivers/pci/quirks.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/pci/quirks.c	2019-12-21 04:47:56.000000000 -0500
@@ -4252,15 +4252,21 @@ static int pci_quirk_amd_sb_acs(struct p
 
 static bool pci_quirk_cavium_acs_match(struct pci_dev *dev)
 {
+	if (!pci_is_pcie(dev) || pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT)
+		return false;
+
+	switch (dev->device) {
 	/*
-	 * Effectively selects all downstream ports for whole ThunderX 1
-	 * family by 0xf800 mask (which represents 8 SoCs), while the lower
-	 * bits of device ID are used to indicate which subdevice is used
-	 * within the SoC.
+	 * Effectively selects all downstream ports for whole ThunderX1
+	 * (which represents 8 SoCs).
 	 */
-	return (pci_is_pcie(dev) &&
-		(pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT) &&
-		((dev->device & 0xf800) == 0xa000));
+	case 0xa000 ... 0xa7ff: /* ThunderX1 */
+	case 0xaf84:  /* ThunderX2 */
+	case 0xb884:  /* ThunderX3 */
+		return true;
+	default:
+		return false;
+	}
 }
 
 static int pci_quirk_cavium_acs(struct pci_dev *dev, u16 acs_flags)
@@ -4600,7 +4606,7 @@ int pci_dev_specific_acs_enabled(struct
 #define INTEL_BSPR_REG_BPPD  (1 << 9)
 
 /* Upstream Peer Decode Configuration Register */
-#define INTEL_UPDCR_REG 0x1114
+#define INTEL_UPDCR_REG 0x1014
 /* 5:0 Peer Decode Enable bits */
 #define INTEL_UPDCR_REG_MASK 0x3f
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/regulator/core.c linux-libre-4.14.160-gnu/drivers/regulator/core.c
--- linux-libre-4.14.159-gnu/drivers/regulator/core.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/regulator/core.c	2019-12-21 04:47:56.000000000 -0500
@@ -4503,7 +4503,7 @@ static int __init regulator_init(void)
 /* init early to allow our consumers to complete system booting */
 core_initcall(regulator_init);
 
-static int regulator_late_cleanup(struct device *dev, void *data)
+static int __init regulator_late_cleanup(struct device *dev, void *data)
 {
 	struct regulator_dev *rdev = dev_to_rdev(dev);
 	const struct regulator_ops *ops = rdev->desc->ops;
@@ -4552,9 +4552,18 @@ unlock:
 	return 0;
 }
 
-static void regulator_init_complete_work_function(struct work_struct *work)
+static int __init regulator_init_complete(void)
 {
 	/*
+	 * Since DT doesn't provide an idiomatic mechanism for
+	 * enabling full constraints and since it's much more natural
+	 * with DT to provide them just assume that a DT enabled
+	 * system has full constraints.
+	 */
+	if (of_have_populated_dt())
+		has_full_constraints = true;
+
+	/*
 	 * Regulators may had failed to resolve their input supplies
 	 * when were registered, either because the input supply was
 	 * not registered yet or because its parent device was not
@@ -4571,35 +4580,6 @@ static void regulator_init_complete_work
 	 */
 	class_for_each_device(&regulator_class, NULL, NULL,
 			      regulator_late_cleanup);
-}
-
-static DECLARE_DELAYED_WORK(regulator_init_complete_work,
-			    regulator_init_complete_work_function);
-
-static int __init regulator_init_complete(void)
-{
-	/*
-	 * Since DT doesn't provide an idiomatic mechanism for
-	 * enabling full constraints and since it's much more natural
-	 * with DT to provide them just assume that a DT enabled
-	 * system has full constraints.
-	 */
-	if (of_have_populated_dt())
-		has_full_constraints = true;
-
-	/*
-	 * We punt completion for an arbitrary amount of time since
-	 * systems like distros will load many drivers from userspace
-	 * so consumers might not always be ready yet, this is
-	 * particularly an issue with laptops where this might bounce
-	 * the display off then on.  Ideally we'd get a notification
-	 * from userspace when this happens but we don't so just wait
-	 * a bit and hope we waited long enough.  It'd be better if
-	 * we'd only do this on systems that need it, and a kernel
-	 * command line option might be useful.
-	 */
-	schedule_delayed_work(&regulator_init_complete_work,
-			      msecs_to_jiffies(30000));
 
 	return 0;
 }
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/rpmsg/qcom_glink_native.c linux-libre-4.14.160-gnu/drivers/rpmsg/qcom_glink_native.c
--- linux-libre-4.14.159-gnu/drivers/rpmsg/qcom_glink_native.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/rpmsg/qcom_glink_native.c	2019-12-21 04:47:56.000000000 -0500
@@ -243,10 +243,31 @@ static void qcom_glink_channel_release(s
 {
 	struct glink_channel *channel = container_of(ref, struct glink_channel,
 						     refcount);
+	struct glink_core_rx_intent *intent;
+	struct glink_core_rx_intent *tmp;
 	unsigned long flags;
+	int iid;
+
+	/* cancel pending rx_done work */
+	cancel_work_sync(&channel->intent_work);
 
 	spin_lock_irqsave(&channel->intent_lock, flags);
+	/* Free all non-reuse intents pending rx_done work */
+	list_for_each_entry_safe(intent, tmp, &channel->done_intents, node) {
+		if (!intent->reuse) {
+			kfree(intent->data);
+			kfree(intent);
+		}
+	}
+
+	idr_for_each_entry(&channel->liids, tmp, iid) {
+		kfree(tmp->data);
+		kfree(tmp);
+	}
 	idr_destroy(&channel->liids);
+
+	idr_for_each_entry(&channel->riids, tmp, iid)
+		kfree(tmp);
 	idr_destroy(&channel->riids);
 	spin_unlock_irqrestore(&channel->intent_lock, flags);
 
@@ -1095,13 +1116,12 @@ static int qcom_glink_create_remote(stru
 close_link:
 	/*
 	 * Send a close request to "undo" our open-ack. The close-ack will
-	 * release the last reference.
+	 * release qcom_glink_send_open_req() reference and the last reference
+	 * will be relesed after receiving remote_close or transport unregister
+	 * by calling qcom_glink_native_remove().
 	 */
 	qcom_glink_send_close_req(glink, channel);
 
-	/* Release qcom_glink_send_open_req() reference */
-	kref_put(&channel->refcount, qcom_glink_channel_release);
-
 	return ret;
 }
 
@@ -1392,15 +1412,13 @@ static int qcom_glink_rx_open(struct qco
 
 		ret = rpmsg_register_device(rpdev);
 		if (ret)
-			goto free_rpdev;
+			goto rcid_remove;
 
 		channel->rpdev = rpdev;
 	}
 
 	return 0;
 
-free_rpdev:
-	kfree(rpdev);
 rcid_remove:
 	spin_lock_irqsave(&glink->idr_lock, flags);
 	idr_remove(&glink->rcids, channel->rcid);
@@ -1521,6 +1539,18 @@ static void qcom_glink_work(struct work_
 	}
 }
 
+static void qcom_glink_cancel_rx_work(struct qcom_glink *glink)
+{
+	struct glink_defer_cmd *dcmd;
+	struct glink_defer_cmd *tmp;
+
+	/* cancel any pending deferred rx_work */
+	cancel_work_sync(&glink->rx_work);
+
+	list_for_each_entry_safe(dcmd, tmp, &glink->rx_queue, node)
+		kfree(dcmd);
+}
+
 struct qcom_glink *qcom_glink_native_probe(struct device *dev,
 					   unsigned long features,
 					   struct qcom_glink_pipe *rx,
@@ -1591,23 +1621,24 @@ void qcom_glink_native_remove(struct qco
 	struct glink_channel *channel;
 	int cid;
 	int ret;
-	unsigned long flags;
 
 	disable_irq(glink->irq);
-	cancel_work_sync(&glink->rx_work);
+	qcom_glink_cancel_rx_work(glink);
 
 	ret = device_for_each_child(glink->dev, NULL, qcom_glink_remove_device);
 	if (ret)
 		dev_warn(glink->dev, "Can't remove GLINK devices: %d\n", ret);
 
-	spin_lock_irqsave(&glink->idr_lock, flags);
 	/* Release any defunct local channels, waiting for close-ack */
 	idr_for_each_entry(&glink->lcids, channel, cid)
 		kref_put(&channel->refcount, qcom_glink_channel_release);
 
+	/* Release any defunct local channels, waiting for close-req */
+	idr_for_each_entry(&glink->rcids, channel, cid)
+		kref_put(&channel->refcount, qcom_glink_channel_release);
+
 	idr_destroy(&glink->lcids);
 	idr_destroy(&glink->rcids);
-	spin_unlock_irqrestore(&glink->idr_lock, flags);
 	mbox_free_channel(glink->mbox_chan);
 }
 EXPORT_SYMBOL_GPL(qcom_glink_native_remove);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/rpmsg/qcom_glink_smem.c linux-libre-4.14.160-gnu/drivers/rpmsg/qcom_glink_smem.c
--- linux-libre-4.14.159-gnu/drivers/rpmsg/qcom_glink_smem.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/rpmsg/qcom_glink_smem.c	2019-12-21 04:47:56.000000000 -0500
@@ -119,7 +119,7 @@ static void glink_smem_rx_advance(struct
 	tail = le32_to_cpu(*pipe->tail);
 
 	tail += count;
-	if (tail > pipe->native.length)
+	if (tail >= pipe->native.length)
 		tail -= pipe->native.length;
 
 	*pipe->tail = cpu_to_le32(tail);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/scsi/libiscsi.c linux-libre-4.14.160-gnu/drivers/scsi/libiscsi.c
--- linux-libre-4.14.159-gnu/drivers/scsi/libiscsi.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/scsi/libiscsi.c	2019-12-21 04:47:56.000000000 -0500
@@ -1983,7 +1983,7 @@ enum blk_eh_timer_return iscsi_eh_cmd_ti
 
 	ISCSI_DBG_EH(session, "scsi cmd %p timedout\n", sc);
 
-	spin_lock(&session->frwd_lock);
+	spin_lock_bh(&session->frwd_lock);
 	task = (struct iscsi_task *)sc->SCp.ptr;
 	if (!task) {
 		/*
@@ -2110,7 +2110,7 @@ enum blk_eh_timer_return iscsi_eh_cmd_ti
 done:
 	if (task)
 		task->last_timeout = jiffies;
-	spin_unlock(&session->frwd_lock);
+	spin_unlock_bh(&session->frwd_lock);
 	ISCSI_DBG_EH(session, "return %s\n", rc == BLK_EH_RESET_TIMER ?
 		     "timer reset" : "shutdown or nh");
 	return rc;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/usb/host/xhci-hub.c linux-libre-4.14.160-gnu/drivers/usb/host/xhci-hub.c
--- linux-libre-4.14.159-gnu/drivers/usb/host/xhci-hub.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/usb/host/xhci-hub.c	2019-12-21 04:47:56.000000000 -0500
@@ -887,6 +887,14 @@ static u32 xhci_get_port_status(struct u
 			status |= USB_PORT_STAT_C_BH_RESET << 16;
 		if ((raw_port_status & PORT_CEC))
 			status |= USB_PORT_STAT_C_CONFIG_ERROR << 16;
+
+		/* USB3 remote wake resume signaling completed */
+		if (bus_state->port_remote_wakeup & (1 << wIndex) &&
+		    (raw_port_status & PORT_PLS_MASK) != XDEV_RESUME &&
+		    (raw_port_status & PORT_PLS_MASK) != XDEV_RECOVERY) {
+			bus_state->port_remote_wakeup &= ~(1 << wIndex);
+			usb_hcd_end_port_resume(&hcd->self, wIndex);
+		}
 	}
 
 	if (hcd->speed < HCD_USB3) {
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/usb/host/xhci-ring.c linux-libre-4.14.160-gnu/drivers/usb/host/xhci-ring.c
--- linux-libre-4.14.159-gnu/drivers/usb/host/xhci-ring.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/usb/host/xhci-ring.c	2019-12-21 04:47:56.000000000 -0500
@@ -1679,9 +1679,6 @@ static void handle_port_status(struct xh
 		usb_hcd_resume_root_hub(hcd);
 	}
 
-	if (hcd->speed >= HCD_USB3 && (portsc & PORT_PLS_MASK) == XDEV_INACTIVE)
-		bus_state->port_remote_wakeup &= ~(1 << faked_port_index);
-
 	if ((portsc & PORT_PLC) && (portsc & PORT_PLS_MASK) == XDEV_RESUME) {
 		xhci_dbg(xhci, "port resume event for port %d\n", port_id);
 
@@ -1700,6 +1697,7 @@ static void handle_port_status(struct xh
 			bus_state->port_remote_wakeup |= 1 << faked_port_index;
 			xhci_test_and_clear_bit(xhci, port_array,
 					faked_port_index, PORT_PLC);
+			usb_hcd_start_port_resume(&hcd->self, faked_port_index);
 			xhci_set_link_state(xhci, port_array, faked_port_index,
 						XDEV_U0);
 			/* Need to wait until the next link state change
@@ -1737,8 +1735,6 @@ static void handle_port_status(struct xh
 		if (slot_id && xhci->devs[slot_id])
 			xhci_ring_device(xhci, slot_id);
 		if (bus_state->port_remote_wakeup & (1 << faked_port_index)) {
-			bus_state->port_remote_wakeup &=
-				~(1 << faked_port_index);
 			xhci_test_and_clear_bit(xhci, port_array,
 					faked_port_index, PORT_PLC);
 			usb_wakeup_notification(hcd->self.root_hub,
diff -druNp --no-dereference linux-libre-4.14.159-gnu/drivers/vfio/pci/vfio_pci_intrs.c linux-libre-4.14.160-gnu/drivers/vfio/pci/vfio_pci_intrs.c
--- linux-libre-4.14.159-gnu/drivers/vfio/pci/vfio_pci_intrs.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/drivers/vfio/pci/vfio_pci_intrs.c	2019-12-21 04:47:56.000000000 -0500
@@ -297,8 +297,8 @@ static int vfio_msi_set_vector_signal(st
 	irq = pci_irq_vector(pdev, vector);
 
 	if (vdev->ctx[vector].trigger) {
-		free_irq(irq, vdev->ctx[vector].trigger);
 		irq_bypass_unregister_producer(&vdev->ctx[vector].producer);
+		free_irq(irq, vdev->ctx[vector].trigger);
 		kfree(vdev->ctx[vector].name);
 		eventfd_ctx_put(vdev->ctx[vector].trigger);
 		vdev->ctx[vector].trigger = NULL;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/fs/cifs/file.c linux-libre-4.14.160-gnu/fs/cifs/file.c
--- linux-libre-4.14.159-gnu/fs/cifs/file.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/fs/cifs/file.c	2019-12-21 04:47:56.000000000 -0500
@@ -722,6 +722,13 @@ cifs_reopen_file(struct cifsFileInfo *cf
 	if (backup_cred(cifs_sb))
 		create_options |= CREATE_OPEN_BACKUP_INTENT;
 
+	/* O_SYNC also has bit for O_DSYNC so following check picks up either */
+	if (cfile->f_flags & O_SYNC)
+		create_options |= CREATE_WRITE_THROUGH;
+
+	if (cfile->f_flags & O_DIRECT)
+		create_options |= CREATE_NO_BUFFER;
+
 	if (server->ops->get_lease_key)
 		server->ops->get_lease_key(inode, &cfile->fid);
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/include/linux/netdevice.h linux-libre-4.14.160-gnu/include/linux/netdevice.h
--- linux-libre-4.14.159-gnu/include/linux/netdevice.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/include/linux/netdevice.h	2019-12-21 04:47:56.000000000 -0500
@@ -1718,6 +1718,11 @@ struct net_device {
 	unsigned char		if_port;
 	unsigned char		dma;
 
+	/* Note : dev->mtu is often read without holding a lock.
+	 * Writers usually hold RTNL.
+	 * It is recommended to use READ_ONCE() to annotate the reads,
+	 * and to use WRITE_ONCE() to annotate the writes.
+	 */
 	unsigned int		mtu;
 	unsigned int		min_mtu;
 	unsigned int		max_mtu;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/include/linux/time.h linux-libre-4.14.160-gnu/include/linux/time.h
--- linux-libre-4.14.159-gnu/include/linux/time.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/include/linux/time.h	2019-12-21 04:47:56.000000000 -0500
@@ -301,4 +301,17 @@ static inline bool itimerspec64_valid(co
  */
 #define time_after32(a, b)	((s32)((u32)(b) - (u32)(a)) < 0)
 #define time_before32(b, a)	time_after32(a, b)
+
+/**
+ * time_between32 - check if a 32-bit timestamp is within a given time range
+ * @t:	the time which may be within [l,h]
+ * @l:	the lower bound of the range
+ * @h:	the higher bound of the range
+ *
+ * time_before32(t, l, h) returns true if @l <= @t <= @h. All operands are
+ * treated as 32-bit integers.
+ *
+ * Equivalent to !(time_before32(@t, @l) || time_after32(@t, @h)).
+ */
+#define time_between32(t, l, h) ((u32)(h) - (u32)(l) >= (u32)(t) - (u32)(l))
 #endif
diff -druNp --no-dereference linux-libre-4.14.159-gnu/include/net/ip.h linux-libre-4.14.160-gnu/include/net/ip.h
--- linux-libre-4.14.159-gnu/include/net/ip.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/include/net/ip.h	2019-12-21 04:47:56.000000000 -0500
@@ -644,4 +644,9 @@ extern int sysctl_icmp_msgs_burst;
 int ip_misc_proc_init(void);
 #endif
 
+static inline bool inetdev_valid_mtu(unsigned int mtu)
+{
+	return likely(mtu >= IPV4_MIN_MTU);
+}
+
 #endif	/* _IP_H */
diff -druNp --no-dereference linux-libre-4.14.159-gnu/include/net/tcp.h linux-libre-4.14.160-gnu/include/net/tcp.h
--- linux-libre-4.14.159-gnu/include/net/tcp.h	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/include/net/tcp.h	2019-12-21 04:47:56.000000000 -0500
@@ -500,19 +500,27 @@ struct sock *cookie_v4_check(struct sock
  */
 static inline void tcp_synq_overflow(const struct sock *sk)
 {
-	unsigned long last_overflow = tcp_sk(sk)->rx_opt.ts_recent_stamp;
+	unsigned long last_overflow = READ_ONCE(tcp_sk(sk)->rx_opt.ts_recent_stamp);
 	unsigned long now = jiffies;
 
-	if (time_after(now, last_overflow + HZ))
-		tcp_sk(sk)->rx_opt.ts_recent_stamp = now;
+	if (!time_between32(now, last_overflow, last_overflow + HZ))
+		WRITE_ONCE(tcp_sk(sk)->rx_opt.ts_recent_stamp, now);
 }
 
 /* syncookies: no recent synqueue overflow on this listening socket? */
 static inline bool tcp_synq_no_recent_overflow(const struct sock *sk)
 {
-	unsigned long last_overflow = tcp_sk(sk)->rx_opt.ts_recent_stamp;
+	unsigned long last_overflow = READ_ONCE(tcp_sk(sk)->rx_opt.ts_recent_stamp);
 
-	return time_after(jiffies, last_overflow + TCP_SYNCOOKIE_VALID);
+	/* If last_overflow <= jiffies <= last_overflow + TCP_SYNCOOKIE_VALID,
+	 * then we're under synflood. However, we have to use
+	 * 'last_overflow - HZ' as lower bound. That's because a concurrent
+	 * tcp_synq_overflow() could update .ts_recent_stamp after we read
+	 * jiffies but before we store .ts_recent_stamp into last_overflow,
+	 * which could lead to rejecting a valid syncookie.
+	 */
+	return !time_between32(jiffies, last_overflow - HZ,
+			       last_overflow + TCP_SYNCOOKIE_VALID);
 }
 
 static inline u32 tcp_cookie_time(void)
diff -druNp --no-dereference linux-libre-4.14.159-gnu/Makefile linux-libre-4.14.160-gnu/Makefile
--- linux-libre-4.14.159-gnu/Makefile	2019-12-17 20:35:59.000000000 -0500
+++ linux-libre-4.14.160-gnu/Makefile	2019-12-21 23:57:20.000000000 -0500
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 159
+SUBLEVEL = 160
 EXTRAVERSION = -gnu
 NAME = Petit Gorille
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/bridge/br_device.c linux-libre-4.14.160-gnu/net/bridge/br_device.c
--- linux-libre-4.14.159-gnu/net/bridge/br_device.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/bridge/br_device.c	2019-12-21 04:47:56.000000000 -0500
@@ -217,6 +217,12 @@ static int br_set_mac_address(struct net
 	if (!is_valid_ether_addr(addr->sa_data))
 		return -EADDRNOTAVAIL;
 
+	/* dev_set_mac_addr() can be called by a master device on bridge's
+	 * NETDEV_UNREGISTER, but since it's being destroyed do nothing
+	 */
+	if (dev->reg_state != NETREG_REGISTERED)
+		return -EBUSY;
+
 	spin_lock_bh(&br->lock);
 	if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) {
 		/* Mac address will be changed in br_stp_change_bridge_id(). */
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/core/dev.c linux-libre-4.14.160-gnu/net/core/dev.c
--- linux-libre-4.14.159-gnu/net/core/dev.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/core/dev.c	2019-12-21 04:47:56.000000000 -0500
@@ -6876,7 +6876,8 @@ int __dev_set_mtu(struct net_device *dev
 	if (ops->ndo_change_mtu)
 		return ops->ndo_change_mtu(dev, new_mtu);
 
-	dev->mtu = new_mtu;
+	/* Pairs with all the lockless reads of dev->mtu in the stack */
+	WRITE_ONCE(dev->mtu, new_mtu);
 	return 0;
 }
 EXPORT_SYMBOL(__dev_set_mtu);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/core/flow_dissector.c linux-libre-4.14.160-gnu/net/core/flow_dissector.c
--- linux-libre-4.14.159-gnu/net/core/flow_dissector.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/core/flow_dissector.c	2019-12-21 04:47:56.000000000 -0500
@@ -450,9 +450,10 @@ bool __skb_flow_dissect(const struct sk_
 		nhoff = skb_network_offset(skb);
 		hlen = skb_headlen(skb);
 #if IS_ENABLED(CONFIG_NET_DSA)
-		if (unlikely(skb->dev && netdev_uses_dsa(skb->dev))) {
+		if (unlikely(skb->dev && netdev_uses_dsa(skb->dev) &&
+			     proto == htons(ETH_P_XDSA))) {
 			const struct dsa_device_ops *ops;
-			int offset;
+			int offset = 0;
 
 			ops = skb->dev->dsa_ptr->tag_ops;
 			if (ops->flow_dissect &&
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/ipv4/devinet.c linux-libre-4.14.160-gnu/net/ipv4/devinet.c
--- linux-libre-4.14.159-gnu/net/ipv4/devinet.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/ipv4/devinet.c	2019-12-21 04:47:56.000000000 -0500
@@ -1426,11 +1426,6 @@ skip:
 	}
 }
 
-static bool inetdev_valid_mtu(unsigned int mtu)
-{
-	return mtu >= IPV4_MIN_MTU;
-}
-
 static void inetdev_send_gratuitous_arp(struct net_device *dev,
 					struct in_device *in_dev)
 
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/ipv4/ip_output.c linux-libre-4.14.160-gnu/net/ipv4/ip_output.c
--- linux-libre-4.14.159-gnu/net/ipv4/ip_output.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/ipv4/ip_output.c	2019-12-21 04:47:56.000000000 -0500
@@ -1123,13 +1123,17 @@ static int ip_setup_cork(struct sock *sk
 	rt = *rtp;
 	if (unlikely(!rt))
 		return -EFAULT;
-	/*
-	 * We steal reference to this route, caller should not release it
-	 */
-	*rtp = NULL;
+
 	cork->fragsize = ip_sk_use_pmtu(sk) ?
-			 dst_mtu(&rt->dst) : rt->dst.dev->mtu;
+			 dst_mtu(&rt->dst) : READ_ONCE(rt->dst.dev->mtu);
+
+	if (!inetdev_valid_mtu(cork->fragsize))
+		return -ENETUNREACH;
+
 	cork->dst = &rt->dst;
+	/* We stole this route, caller should not release it. */
+	*rtp = NULL;
+
 	cork->length = 0;
 	cork->ttl = ipc->ttl;
 	cork->tos = ipc->tos;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/ipv4/tcp_output.c linux-libre-4.14.160-gnu/net/ipv4/tcp_output.c
--- linux-libre-4.14.159-gnu/net/ipv4/tcp_output.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/ipv4/tcp_output.c	2019-12-21 04:47:56.000000000 -0500
@@ -708,8 +708,9 @@ static unsigned int tcp_established_opti
 			min_t(unsigned int, eff_sacks,
 			      (remaining - TCPOLEN_SACK_BASE_ALIGNED) /
 			      TCPOLEN_SACK_PERBLOCK);
-		size += TCPOLEN_SACK_BASE_ALIGNED +
-			opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK;
+		if (likely(opts->num_sack_blocks))
+			size += TCPOLEN_SACK_BASE_ALIGNED +
+				opts->num_sack_blocks * TCPOLEN_SACK_PERBLOCK;
 	}
 
 	return size;
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/openvswitch/conntrack.c linux-libre-4.14.160-gnu/net/openvswitch/conntrack.c
--- linux-libre-4.14.159-gnu/net/openvswitch/conntrack.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/openvswitch/conntrack.c	2019-12-21 04:47:56.000000000 -0500
@@ -879,6 +879,17 @@ static int ovs_ct_nat(struct net *net, s
 	}
 	err = ovs_ct_nat_execute(skb, ct, ctinfo, &info->range, maniptype);
 
+	if (err == NF_ACCEPT &&
+	    ct->status & IPS_SRC_NAT && ct->status & IPS_DST_NAT) {
+		if (maniptype == NF_NAT_MANIP_SRC)
+			maniptype = NF_NAT_MANIP_DST;
+		else
+			maniptype = NF_NAT_MANIP_SRC;
+
+		err = ovs_ct_nat_execute(skb, ct, ctinfo, &info->range,
+					 maniptype);
+	}
+
 	/* Mark NAT done if successful and update the flow key. */
 	if (err == NF_ACCEPT)
 		ovs_nat_update_key(key, skb, maniptype);
diff -druNp --no-dereference linux-libre-4.14.159-gnu/net/tipc/core.c linux-libre-4.14.160-gnu/net/tipc/core.c
--- linux-libre-4.14.159-gnu/net/tipc/core.c	2019-12-17 14:40:05.000000000 -0500
+++ linux-libre-4.14.160-gnu/net/tipc/core.c	2019-12-21 04:47:56.000000000 -0500
@@ -116,14 +116,6 @@ static int __init tipc_init(void)
 	sysctl_tipc_rmem[1] = RCVBUF_DEF;
 	sysctl_tipc_rmem[2] = RCVBUF_MAX;
 
-	err = tipc_netlink_start();
-	if (err)
-		goto out_netlink;
-
-	err = tipc_netlink_compat_start();
-	if (err)
-		goto out_netlink_compat;
-
 	err = tipc_register_sysctl();
 	if (err)
 		goto out_sysctl;
@@ -144,8 +136,21 @@ static int __init tipc_init(void)
 	if (err)
 		goto out_bearer;
 
+	err = tipc_netlink_start();
+	if (err)
+		goto out_netlink;
+
+	err = tipc_netlink_compat_start();
+	if (err)
+		goto out_netlink_compat;
+
 	pr_info("Started in single node mode\n");
 	return 0;
+
+out_netlink_compat:
+	tipc_netlink_stop();
+out_netlink:
+	tipc_bearer_cleanup();
 out_bearer:
 	unregister_pernet_device(&tipc_topsrv_net_ops);
 out_pernet_topsrv:
@@ -155,22 +160,18 @@ out_socket:
 out_pernet:
 	tipc_unregister_sysctl();
 out_sysctl:
-	tipc_netlink_compat_stop();
-out_netlink_compat:
-	tipc_netlink_stop();
-out_netlink:
 	pr_err("Unable to start in single node mode\n");
 	return err;
 }
 
 static void __exit tipc_exit(void)
 {
+	tipc_netlink_compat_stop();
+	tipc_netlink_stop();
 	tipc_bearer_cleanup();
 	unregister_pernet_device(&tipc_topsrv_net_ops);
 	tipc_socket_stop();
 	unregister_pernet_device(&tipc_net_ops);
-	tipc_netlink_stop();
-	tipc_netlink_compat_stop();
 	tipc_unregister_sysctl();
 
 	pr_info("Deactivated\n");
