diff -druNp --no-dereference linux-libre-4.20.11-gnu/arch/arm64/include/asm/memory.h linux-libre-4.20.12-gnu/arch/arm64/include/asm/memory.h
--- linux-libre-4.20.11-gnu/arch/arm64/include/asm/memory.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/arch/arm64/include/asm/memory.h	2019-02-23 03:08:07.000000000 -0500
@@ -303,6 +303,17 @@ static inline void *phys_to_virt(phys_ad
 #define virt_addr_valid(kaddr)		(_virt_addr_is_linear(kaddr) && \
 					 _virt_addr_valid(kaddr))
 
+/*
+ * Given that the GIC architecture permits ITS implementations that can only be
+ * configured with a LPI table address once, GICv3 systems with many CPUs may
+ * end up reserving a lot of different regions after a kexec for their LPI
+ * tables (one per CPU), as we are forced to reuse the same memory after kexec
+ * (and thus reserve it persistently with EFI beforehand)
+ */
+#if defined(CONFIG_EFI) && defined(CONFIG_ARM_GIC_V3_ITS)
+# define INIT_MEMBLOCK_RESERVED_REGIONS	(INIT_MEMBLOCK_REGIONS + 2*(NR_CPUS + 1))
+#endif
+
 #include <asm-generic/memory_model.h>
 
 #endif
diff -druNp --no-dereference linux-libre-4.20.11-gnu/arch/arm64/kernel/setup.c linux-libre-4.20.12-gnu/arch/arm64/kernel/setup.c
--- linux-libre-4.20.11-gnu/arch/arm64/kernel/setup.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/arch/arm64/kernel/setup.c	2019-02-23 03:08:07.000000000 -0500
@@ -313,7 +313,6 @@ void __init setup_arch(char **cmdline_p)
 	arm64_memblock_init();
 
 	paging_init();
-	efi_apply_persistent_mem_reservations();
 
 	acpi_table_upgrade();
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/crypto/af_alg.c linux-libre-4.20.12-gnu/crypto/af_alg.c
--- linux-libre-4.20.11-gnu/crypto/af_alg.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/crypto/af_alg.c	2019-02-23 03:08:07.000000000 -0500
@@ -122,8 +122,10 @@ static void alg_do_release(const struct
 
 int af_alg_release(struct socket *sock)
 {
-	if (sock->sk)
+	if (sock->sk) {
 		sock_put(sock->sk);
+		sock->sk = NULL;
+	}
 	return 0;
 }
 EXPORT_SYMBOL_GPL(af_alg_release);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/firmware/efi/efi.c linux-libre-4.20.12-gnu/drivers/firmware/efi/efi.c
--- linux-libre-4.20.11-gnu/drivers/firmware/efi/efi.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/firmware/efi/efi.c	2019-02-23 03:08:07.000000000 -0500
@@ -592,11 +592,7 @@ int __init efi_config_parse_tables(void
 
 		early_memunmap(tbl, sizeof(*tbl));
 	}
-	return 0;
-}
 
-int __init efi_apply_persistent_mem_reservations(void)
-{
 	if (efi.mem_reserve != EFI_INVALID_TABLE_ADDR) {
 		unsigned long prsv = efi.mem_reserve;
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/firmware/efi/libstub/arm-stub.c linux-libre-4.20.12-gnu/drivers/firmware/efi/libstub/arm-stub.c
--- linux-libre-4.20.11-gnu/drivers/firmware/efi/libstub/arm-stub.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/firmware/efi/libstub/arm-stub.c	2019-02-23 03:08:07.000000000 -0500
@@ -75,9 +75,6 @@ void install_memreserve_table(efi_system
 	efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID;
 	efi_status_t status;
 
-	if (IS_ENABLED(CONFIG_ARM))
-		return;
-
 	status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv),
 				(void **)&rsv);
 	if (status != EFI_SUCCESS) {
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/hwmon/lm80.c linux-libre-4.20.12-gnu/drivers/hwmon/lm80.c
--- linux-libre-4.20.11-gnu/drivers/hwmon/lm80.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/hwmon/lm80.c	2019-02-23 03:08:07.000000000 -0500
@@ -393,8 +393,10 @@ static ssize_t set_fan_div(struct device
 	}
 
 	rv = lm80_read_value(client, LM80_REG_FANDIV);
-	if (rv < 0)
+	if (rv < 0) {
+		mutex_unlock(&data->update_lock);
 		return rv;
+	}
 	reg = (rv & ~(3 << (2 * (nr + 1))))
 	    | (data->fan_div[nr] << (2 * (nr + 1)));
 	lm80_write_value(client, LM80_REG_FANDIV, reg);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/isdn/mISDN/timerdev.c linux-libre-4.20.12-gnu/drivers/isdn/mISDN/timerdev.c
--- linux-libre-4.20.11-gnu/drivers/isdn/mISDN/timerdev.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/isdn/mISDN/timerdev.c	2019-02-23 03:08:07.000000000 -0500
@@ -170,8 +170,8 @@ dev_expire_timer(struct timer_list *t)
 	spin_lock_irqsave(&timer->dev->lock, flags);
 	if (timer->id >= 0)
 		list_move_tail(&timer->list, &timer->dev->expired);
-	spin_unlock_irqrestore(&timer->dev->lock, flags);
 	wake_up_interruptible(&timer->dev->wait);
+	spin_unlock_irqrestore(&timer->dev->lock, flags);
 }
 
 static int
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/mmc/host/meson-gx-mmc.c linux-libre-4.20.12-gnu/drivers/mmc/host/meson-gx-mmc.c
--- linux-libre-4.20.11-gnu/drivers/mmc/host/meson-gx-mmc.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/mmc/host/meson-gx-mmc.c	2019-02-23 03:08:07.000000000 -0500
@@ -1286,7 +1286,8 @@ static int meson_mmc_probe(struct platfo
 	       host->regs + SD_EMMC_IRQ_EN);
 
 	ret = request_threaded_irq(host->irq, meson_mmc_irq,
-			meson_mmc_irq_thread, IRQF_SHARED, NULL, host);
+				   meson_mmc_irq_thread, IRQF_SHARED,
+				   dev_name(&pdev->dev), host);
 	if (ret)
 		goto err_init_clk;
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/dsa/mv88e6xxx/chip.c linux-libre-4.20.12-gnu/drivers/net/dsa/mv88e6xxx/chip.c
--- linux-libre-4.20.11-gnu/drivers/net/dsa/mv88e6xxx/chip.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/dsa/mv88e6xxx/chip.c	2019-02-23 03:08:07.000000000 -0500
@@ -261,6 +261,7 @@ static irqreturn_t mv88e6xxx_g1_irq_thre
 	unsigned int sub_irq;
 	unsigned int n;
 	u16 reg;
+	u16 ctl1;
 	int err;
 
 	mutex_lock(&chip->reg_lock);
@@ -270,13 +271,28 @@ static irqreturn_t mv88e6xxx_g1_irq_thre
 	if (err)
 		goto out;
 
-	for (n = 0; n < chip->g1_irq.nirqs; ++n) {
-		if (reg & (1 << n)) {
-			sub_irq = irq_find_mapping(chip->g1_irq.domain, n);
-			handle_nested_irq(sub_irq);
-			++nhandled;
+	do {
+		for (n = 0; n < chip->g1_irq.nirqs; ++n) {
+			if (reg & (1 << n)) {
+				sub_irq = irq_find_mapping(chip->g1_irq.domain,
+							   n);
+				handle_nested_irq(sub_irq);
+				++nhandled;
+			}
 		}
-	}
+
+		mutex_lock(&chip->reg_lock);
+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_CTL1, &ctl1);
+		if (err)
+			goto unlock;
+		err = mv88e6xxx_g1_read(chip, MV88E6XXX_G1_STS, &reg);
+unlock:
+		mutex_unlock(&chip->reg_lock);
+		if (err)
+			goto out;
+		ctl1 &= GENMASK(chip->g1_irq.nirqs, 0);
+	} while (reg & ctl1);
+
 out:
 	return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
 }
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/ethernet/marvell/sky2.c linux-libre-4.20.12-gnu/drivers/net/ethernet/marvell/sky2.c
--- linux-libre-4.20.11-gnu/drivers/net/ethernet/marvell/sky2.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/ethernet/marvell/sky2.c	2019-02-23 03:08:07.000000000 -0500
@@ -5087,7 +5087,7 @@ static int sky2_probe(struct pci_dev *pd
 	INIT_WORK(&hw->restart_work, sky2_restart);
 
 	pci_set_drvdata(pdev, hw);
-	pdev->d3_delay = 200;
+	pdev->d3_delay = 300;
 
 	return 0;
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/ethernet/mellanox/mlxsw/spectrum.c linux-libre-4.20.12-gnu/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
--- linux-libre-4.20.11-gnu/drivers/net/ethernet/mellanox/mlxsw/spectrum.c	2019-02-20 14:55:39.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/ethernet/mellanox/mlxsw/spectrum.c	2019-02-23 12:42:54.000000000 -0500
@@ -843,8 +843,9 @@ int __mlxsw_sp_port_headroom_set(struct
 	for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) {
 		bool configure = false;
 		bool pfc = false;
+		u16 thres_cells;
+		u16 delay_cells;
 		bool lossy;
-		u16 thres;
 
 		for (j = 0; j < IEEE_8021QAZ_MAX_TCS; j++) {
 			if (prio_tc[j] == i) {
@@ -858,10 +859,11 @@ int __mlxsw_sp_port_headroom_set(struct
 			continue;
 
 		lossy = !(pfc || pause_en);
-		thres = mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu);
-		delay = mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay, pfc,
-						  pause_en);
-		mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres + delay, thres, lossy);
+		thres_cells = mlxsw_sp_pg_buf_threshold_get(mlxsw_sp, mtu);
+		delay_cells = mlxsw_sp_pg_buf_delay_get(mlxsw_sp, mtu, delay,
+							pfc, pause_en);
+		mlxsw_sp_pg_buf_pack(pbmc_pl, i, thres_cells + delay_cells,
+				     thres_cells, lossy);
 	}
 
 	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(pbmc), pbmc_pl);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c linux-libre-4.20.12-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c
--- linux-libre-4.20.11-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c	2019-02-23 03:08:07.000000000 -0500
@@ -241,15 +241,18 @@ static inline void dwmac4_get_timestamp(
 static int dwmac4_rx_check_timestamp(void *desc)
 {
 	struct dma_desc *p = (struct dma_desc *)desc;
+	unsigned int rdes0 = le32_to_cpu(p->des0);
+	unsigned int rdes1 = le32_to_cpu(p->des1);
+	unsigned int rdes3 = le32_to_cpu(p->des3);
 	u32 own, ctxt;
 	int ret = 1;
 
-	own = p->des3 & RDES3_OWN;
-	ctxt = ((p->des3 & RDES3_CONTEXT_DESCRIPTOR)
+	own = rdes3 & RDES3_OWN;
+	ctxt = ((rdes3 & RDES3_CONTEXT_DESCRIPTOR)
 		>> RDES3_CONTEXT_DESCRIPTOR_SHIFT);
 
 	if (likely(!own && ctxt)) {
-		if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff))
+		if ((rdes0 == 0xffffffff) && (rdes1 == 0xffffffff))
 			/* Corrupted value */
 			ret = -EINVAL;
 		else
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c linux-libre-4.20.12-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
--- linux-libre-4.20.11-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c	2019-02-23 03:08:07.000000000 -0500
@@ -692,25 +692,27 @@ static int stmmac_ethtool_op_set_eee(str
 				     struct ethtool_eee *edata)
 {
 	struct stmmac_priv *priv = netdev_priv(dev);
+	int ret;
 
-	priv->eee_enabled = edata->eee_enabled;
-
-	if (!priv->eee_enabled)
+	if (!edata->eee_enabled) {
 		stmmac_disable_eee_mode(priv);
-	else {
+	} else {
 		/* We are asking for enabling the EEE but it is safe
 		 * to verify all by invoking the eee_init function.
 		 * In case of failure it will return an error.
 		 */
-		priv->eee_enabled = stmmac_eee_init(priv);
-		if (!priv->eee_enabled)
+		edata->eee_enabled = stmmac_eee_init(priv);
+		if (!edata->eee_enabled)
 			return -EOPNOTSUPP;
-
-		/* Do not change tx_lpi_timer in case of failure */
-		priv->tx_lpi_timer = edata->tx_lpi_timer;
 	}
 
-	return phy_ethtool_set_eee(dev->phydev, edata);
+	ret = phy_ethtool_set_eee(dev->phydev, edata);
+	if (ret)
+		return ret;
+
+	priv->eee_enabled = edata->eee_enabled;
+	priv->tx_lpi_timer = edata->tx_lpi_timer;
+	return 0;
 }
 
 static u32 stmmac_usec2riwt(u32 usec, struct stmmac_priv *priv)
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/ethernet/ti/netcp_core.c linux-libre-4.20.12-gnu/drivers/net/ethernet/ti/netcp_core.c
--- linux-libre-4.20.11-gnu/drivers/net/ethernet/ti/netcp_core.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/ethernet/ti/netcp_core.c	2019-02-23 03:08:07.000000000 -0500
@@ -259,7 +259,7 @@ static int netcp_module_probe(struct net
 		const char *name;
 		char node_name[32];
 
-		if (of_property_read_string(node, "label", &name) < 0) {
+		if (of_property_read_string(child, "label", &name) < 0) {
 			snprintf(node_name, sizeof(node_name), "%pOFn", child);
 			name = node_name;
 		}
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/phy/xilinx_gmii2rgmii.c linux-libre-4.20.12-gnu/drivers/net/phy/xilinx_gmii2rgmii.c
--- linux-libre-4.20.11-gnu/drivers/net/phy/xilinx_gmii2rgmii.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/phy/xilinx_gmii2rgmii.c	2019-02-23 03:08:07.000000000 -0500
@@ -44,7 +44,10 @@ static int xgmiitorgmii_read_status(stru
 	u16 val = 0;
 	int err;
 
-	err = priv->phy_drv->read_status(phydev);
+	if (priv->phy_drv->read_status)
+		err = priv->phy_drv->read_status(phydev);
+	else
+		err = genphy_read_status(phydev);
 	if (err < 0)
 		return err;
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/net/vxlan.c linux-libre-4.20.12-gnu/drivers/net/vxlan.c
--- linux-libre-4.20.11-gnu/drivers/net/vxlan.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/net/vxlan.c	2019-02-23 03:08:07.000000000 -0500
@@ -2072,7 +2072,7 @@ static void vxlan_encap_bypass(struct sk
 	struct pcpu_sw_netstats *tx_stats, *rx_stats;
 	union vxlan_addr loopback;
 	union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
-	struct net_device *dev = skb->dev;
+	struct net_device *dev;
 	int len = skb->len;
 
 	tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
@@ -2092,9 +2092,15 @@ static void vxlan_encap_bypass(struct sk
 #endif
 	}
 
+	rcu_read_lock();
+	dev = skb->dev;
+	if (unlikely(!(dev->flags & IFF_UP))) {
+		kfree_skb(skb);
+		goto drop;
+	}
+
 	if (dst_vxlan->cfg.flags & VXLAN_F_LEARN)
-		vxlan_snoop(skb->dev, &loopback, eth_hdr(skb)->h_source, 0,
-			    vni);
+		vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0, vni);
 
 	u64_stats_update_begin(&tx_stats->syncp);
 	tx_stats->tx_packets++;
@@ -2107,8 +2113,10 @@ static void vxlan_encap_bypass(struct sk
 		rx_stats->rx_bytes += len;
 		u64_stats_update_end(&rx_stats->syncp);
 	} else {
+drop:
 		dev->stats.rx_dropped++;
 	}
+	rcu_read_unlock();
 }
 
 static int encap_bypass_if_local(struct sk_buff *skb, struct net_device *dev,
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/pci/pci.c linux-libre-4.20.12-gnu/drivers/pci/pci.c
--- linux-libre-4.20.11-gnu/drivers/pci/pci.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/pci/pci.c	2019-02-23 03:08:07.000000000 -0500
@@ -6195,7 +6195,8 @@ static int __init pci_setup(char *str)
 			} else if (!strncmp(str, "pcie_scan_all", 13)) {
 				pci_add_flags(PCI_SCAN_ALL_PCIE_DEVS);
 			} else if (!strncmp(str, "disable_acs_redir=", 18)) {
-				disable_acs_redir_param = str + 18;
+				disable_acs_redir_param =
+					kstrdup(str + 18, GFP_KERNEL);
 			} else {
 				printk(KERN_ERR "PCI: Unknown option `%s'\n",
 						str);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/target/target_core_transport.c linux-libre-4.20.12-gnu/drivers/target/target_core_transport.c
--- linux-libre-4.20.11-gnu/drivers/target/target_core_transport.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/target/target_core_transport.c	2019-02-23 03:08:07.000000000 -0500
@@ -266,7 +266,7 @@ struct se_session *transport_alloc_sessi
 	}
 	ret = transport_init_session(se_sess);
 	if (ret < 0) {
-		kfree(se_sess);
+		kmem_cache_free(se_sess_cache, se_sess);
 		return ERR_PTR(ret);
 	}
 	se_sess->sup_prot_ops = sup_prot_ops;
diff -druNp --no-dereference linux-libre-4.20.11-gnu/drivers/vhost/vhost.c linux-libre-4.20.12-gnu/drivers/vhost/vhost.c
--- linux-libre-4.20.11-gnu/drivers/vhost/vhost.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/drivers/vhost/vhost.c	2019-02-23 03:08:07.000000000 -0500
@@ -1784,7 +1784,7 @@ static int log_used(struct vhost_virtque
 
 	ret = translate_desc(vq, (uintptr_t)vq->used + used_offset,
 			     len, iov, 64, VHOST_ACCESS_WO);
-	if (ret)
+	if (ret < 0)
 		return ret;
 
 	for (i = 0; i < ret; i++) {
diff -druNp --no-dereference linux-libre-4.20.11-gnu/include/linux/efi.h linux-libre-4.20.12-gnu/include/linux/efi.h
--- linux-libre-4.20.11-gnu/include/linux/efi.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/include/linux/efi.h	2019-02-23 03:08:07.000000000 -0500
@@ -1167,8 +1167,6 @@ static inline bool efi_enabled(int featu
 extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
 
 extern bool efi_is_table_address(unsigned long phys_addr);
-
-extern int efi_apply_persistent_mem_reservations(void);
 #else
 static inline bool efi_enabled(int feature)
 {
@@ -1187,11 +1185,6 @@ static inline bool efi_is_table_address(
 {
 	return false;
 }
-
-static inline int efi_apply_persistent_mem_reservations(void)
-{
-	return 0;
-}
 #endif
 
 extern int efi_status_to_err(efi_status_t status);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/include/linux/memblock.h linux-libre-4.20.12-gnu/include/linux/memblock.h
--- linux-libre-4.20.11-gnu/include/linux/memblock.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/include/linux/memblock.h	2019-02-23 03:08:07.000000000 -0500
@@ -29,9 +29,6 @@ extern unsigned long max_pfn;
  */
 extern unsigned long long max_possible_pfn;
 
-#define INIT_MEMBLOCK_REGIONS	128
-#define INIT_PHYSMEM_REGIONS	4
-
 /**
  * enum memblock_flags - definition of memory region attributes
  * @MEMBLOCK_NONE: no special request
diff -druNp --no-dereference linux-libre-4.20.11-gnu/include/linux/netdev_features.h linux-libre-4.20.12-gnu/include/linux/netdev_features.h
--- linux-libre-4.20.11-gnu/include/linux/netdev_features.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/include/linux/netdev_features.h	2019-02-23 03:08:07.000000000 -0500
@@ -11,6 +11,8 @@
 #define _LINUX_NETDEV_FEATURES_H
 
 #include <linux/types.h>
+#include <linux/bitops.h>
+#include <asm/byteorder.h>
 
 typedef u64 netdev_features_t;
 
@@ -154,8 +156,26 @@ enum {
 #define NETIF_F_HW_TLS_TX	__NETIF_F(HW_TLS_TX)
 #define NETIF_F_HW_TLS_RX	__NETIF_F(HW_TLS_RX)
 
-#define for_each_netdev_feature(mask_addr, bit)	\
-	for_each_set_bit(bit, (unsigned long *)mask_addr, NETDEV_FEATURE_COUNT)
+/* Finds the next feature with the highest number of the range of start till 0.
+ */
+static inline int find_next_netdev_feature(u64 feature, unsigned long start)
+{
+	/* like BITMAP_LAST_WORD_MASK() for u64
+	 * this sets the most significant 64 - start to 0.
+	 */
+	feature &= ~0ULL >> (-start & ((sizeof(feature) * 8) - 1));
+
+	return fls64(feature) - 1;
+}
+
+/* This goes for the MSB to the LSB through the set feature bits,
+ * mask_addr should be a u64 and bit an int
+ */
+#define for_each_netdev_feature(mask_addr, bit)				\
+	for ((bit) = find_next_netdev_feature((mask_addr),		\
+					      NETDEV_FEATURE_COUNT);	\
+	     (bit) >= 0;						\
+	     (bit) = find_next_netdev_feature((mask_addr), (bit) - 1))
 
 /* Features valid for ethtool to change */
 /* = all defined minus driver/device-class-related */
diff -druNp --no-dereference linux-libre-4.20.11-gnu/include/net/ax25.h linux-libre-4.20.12-gnu/include/net/ax25.h
--- linux-libre-4.20.11-gnu/include/net/ax25.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/include/net/ax25.h	2019-02-23 03:08:07.000000000 -0500
@@ -201,6 +201,18 @@ static inline void ax25_hold_route(ax25_
 
 void __ax25_put_route(ax25_route *ax25_rt);
 
+extern rwlock_t ax25_route_lock;
+
+static inline void ax25_route_lock_use(void)
+{
+	read_lock(&ax25_route_lock);
+}
+
+static inline void ax25_route_lock_unuse(void)
+{
+	read_unlock(&ax25_route_lock);
+}
+
 static inline void ax25_put_route(ax25_route *ax25_rt)
 {
 	if (refcount_dec_and_test(&ax25_rt->refcount))
diff -druNp --no-dereference linux-libre-4.20.11-gnu/include/net/inetpeer.h linux-libre-4.20.12-gnu/include/net/inetpeer.h
--- linux-libre-4.20.11-gnu/include/net/inetpeer.h	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/include/net/inetpeer.h	2019-02-23 03:08:07.000000000 -0500
@@ -39,6 +39,7 @@ struct inet_peer {
 
 	u32			metrics[RTAX_MAX];
 	u32			rate_tokens;	/* rate limiting for ICMP */
+	u32			n_redirects;
 	unsigned long		rate_last;
 	/*
 	 * Once inet_peer is queued for deletion (refcnt == 0), following field
diff -druNp --no-dereference linux-libre-4.20.11-gnu/Makefile linux-libre-4.20.12-gnu/Makefile
--- linux-libre-4.20.11-gnu/Makefile	2019-02-20 14:42:57.000000000 -0500
+++ linux-libre-4.20.12-gnu/Makefile	2019-02-23 12:29:10.000000000 -0500
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 20
-SUBLEVEL = 11
+SUBLEVEL = 12
 EXTRAVERSION = -gnu
 NAME = Shy Crocodile
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/mm/memblock.c linux-libre-4.20.12-gnu/mm/memblock.c
--- linux-libre-4.20.11-gnu/mm/memblock.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/mm/memblock.c	2019-02-23 03:08:07.000000000 -0500
@@ -26,6 +26,13 @@
 
 #include "internal.h"
 
+#define INIT_MEMBLOCK_REGIONS			128
+#define INIT_PHYSMEM_REGIONS			4
+
+#ifndef INIT_MEMBLOCK_RESERVED_REGIONS
+# define INIT_MEMBLOCK_RESERVED_REGIONS		INIT_MEMBLOCK_REGIONS
+#endif
+
 /**
  * DOC: memblock overview
  *
@@ -92,7 +99,7 @@ unsigned long max_pfn;
 unsigned long long max_possible_pfn;
 
 static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
-static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
+static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_RESERVED_REGIONS] __initdata_memblock;
 #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
 static struct memblock_region memblock_physmem_init_regions[INIT_PHYSMEM_REGIONS] __initdata_memblock;
 #endif
@@ -105,7 +112,7 @@ struct memblock memblock __initdata_memb
 
 	.reserved.regions	= memblock_reserved_init_regions,
 	.reserved.cnt		= 1,	/* empty dummy entry */
-	.reserved.max		= INIT_MEMBLOCK_REGIONS,
+	.reserved.max		= INIT_MEMBLOCK_RESERVED_REGIONS,
 	.reserved.name		= "reserved",
 
 #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ax25/ax25_ip.c linux-libre-4.20.12-gnu/net/ax25/ax25_ip.c
--- linux-libre-4.20.11-gnu/net/ax25/ax25_ip.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ax25/ax25_ip.c	2019-02-23 03:08:07.000000000 -0500
@@ -114,6 +114,7 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff
 	dst = (ax25_address *)(bp + 1);
 	src = (ax25_address *)(bp + 8);
 
+	ax25_route_lock_use();
 	route = ax25_get_route(dst, NULL);
 	if (route) {
 		digipeat = route->digipeat;
@@ -206,9 +207,8 @@ netdev_tx_t ax25_ip_xmit(struct sk_buff
 	ax25_queue_xmit(skb, dev);
 
 put:
-	if (route)
-		ax25_put_route(route);
 
+	ax25_route_lock_unuse();
 	return NETDEV_TX_OK;
 }
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ax25/ax25_route.c linux-libre-4.20.12-gnu/net/ax25/ax25_route.c
--- linux-libre-4.20.11-gnu/net/ax25/ax25_route.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ax25/ax25_route.c	2019-02-23 03:08:07.000000000 -0500
@@ -40,7 +40,7 @@
 #include <linux/export.h>
 
 static ax25_route *ax25_route_list;
-static DEFINE_RWLOCK(ax25_route_lock);
+DEFINE_RWLOCK(ax25_route_lock);
 
 void ax25_rt_device_down(struct net_device *dev)
 {
@@ -335,6 +335,7 @@ const struct seq_operations ax25_rt_seqo
  *	Find AX.25 route
  *
  *	Only routes with a reference count of zero can be destroyed.
+ *	Must be called with ax25_route_lock read locked.
  */
 ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev)
 {
@@ -342,7 +343,6 @@ ax25_route *ax25_get_route(ax25_address
 	ax25_route *ax25_def_rt = NULL;
 	ax25_route *ax25_rt;
 
-	read_lock(&ax25_route_lock);
 	/*
 	 *	Bind to the physical interface we heard them on, or the default
 	 *	route if none is found;
@@ -365,11 +365,6 @@ ax25_route *ax25_get_route(ax25_address
 	if (ax25_spe_rt != NULL)
 		ax25_rt = ax25_spe_rt;
 
-	if (ax25_rt != NULL)
-		ax25_hold_route(ax25_rt);
-
-	read_unlock(&ax25_route_lock);
-
 	return ax25_rt;
 }
 
@@ -400,9 +395,12 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25
 	ax25_route *ax25_rt;
 	int err = 0;
 
-	if ((ax25_rt = ax25_get_route(addr, NULL)) == NULL)
+	ax25_route_lock_use();
+	ax25_rt = ax25_get_route(addr, NULL);
+	if (!ax25_rt) {
+		ax25_route_lock_unuse();
 		return -EHOSTUNREACH;
-
+	}
 	if ((ax25->ax25_dev = ax25_dev_ax25dev(ax25_rt->dev)) == NULL) {
 		err = -EHOSTUNREACH;
 		goto put;
@@ -437,8 +435,7 @@ int ax25_rt_autobind(ax25_cb *ax25, ax25
 	}
 
 put:
-	ax25_put_route(ax25_rt);
-
+	ax25_route_lock_unuse();
 	return err;
 }
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/core/dev.c linux-libre-4.20.12-gnu/net/core/dev.c
--- linux-libre-4.20.11-gnu/net/core/dev.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/core/dev.c	2019-02-23 03:08:07.000000000 -0500
@@ -8064,7 +8064,7 @@ static netdev_features_t netdev_sync_upp
 	netdev_features_t feature;
 	int feature_bit;
 
-	for_each_netdev_feature(&upper_disables, feature_bit) {
+	for_each_netdev_feature(upper_disables, feature_bit) {
 		feature = __NETIF_F_BIT(feature_bit);
 		if (!(upper->wanted_features & feature)
 		    && (features & feature)) {
@@ -8084,7 +8084,7 @@ static void netdev_sync_lower_features(s
 	netdev_features_t feature;
 	int feature_bit;
 
-	for_each_netdev_feature(&upper_disables, feature_bit) {
+	for_each_netdev_feature(upper_disables, feature_bit) {
 		feature = __NETIF_F_BIT(feature_bit);
 		if (!(features & feature) && (lower->features & feature)) {
 			netdev_dbg(upper, "Disabling feature %pNF on lower dev %s.\n",
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/core/skbuff.c linux-libre-4.20.12-gnu/net/core/skbuff.c
--- linux-libre-4.20.11-gnu/net/core/skbuff.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/core/skbuff.c	2019-02-23 03:08:07.000000000 -0500
@@ -353,6 +353,8 @@ static void *__netdev_alloc_frag(unsigne
  */
 void *netdev_alloc_frag(unsigned int fragsz)
 {
+	fragsz = SKB_DATA_ALIGN(fragsz);
+
 	return __netdev_alloc_frag(fragsz, GFP_ATOMIC);
 }
 EXPORT_SYMBOL(netdev_alloc_frag);
@@ -366,6 +368,8 @@ static void *__napi_alloc_frag(unsigned
 
 void *napi_alloc_frag(unsigned int fragsz)
 {
+	fragsz = SKB_DATA_ALIGN(fragsz);
+
 	return __napi_alloc_frag(fragsz, GFP_ATOMIC);
 }
 EXPORT_SYMBOL(napi_alloc_frag);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv4/inetpeer.c linux-libre-4.20.12-gnu/net/ipv4/inetpeer.c
--- linux-libre-4.20.11-gnu/net/ipv4/inetpeer.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv4/inetpeer.c	2019-02-23 03:08:07.000000000 -0500
@@ -216,6 +216,7 @@ struct inet_peer *inet_getpeer(struct in
 			atomic_set(&p->rid, 0);
 			p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
 			p->rate_tokens = 0;
+			p->n_redirects = 0;
 			/* 60*HZ is arbitrary, but chosen enough high so that the first
 			 * calculation of tokens is at its maximum.
 			 */
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv4/netfilter/nf_nat_snmp_basic_main.c linux-libre-4.20.12-gnu/net/ipv4/netfilter/nf_nat_snmp_basic_main.c
--- linux-libre-4.20.11-gnu/net/ipv4/netfilter/nf_nat_snmp_basic_main.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv4/netfilter/nf_nat_snmp_basic_main.c	2019-02-23 03:08:07.000000000 -0500
@@ -105,6 +105,8 @@ static void fast_csum(struct snmp_ctx *c
 int snmp_version(void *context, size_t hdrlen, unsigned char tag,
 		 const void *data, size_t datalen)
 {
+	if (datalen != 1)
+		return -EINVAL;
 	if (*(unsigned char *)data > 1)
 		return -ENOTSUPP;
 	return 1;
@@ -114,8 +116,11 @@ int snmp_helper(void *context, size_t hd
 		const void *data, size_t datalen)
 {
 	struct snmp_ctx *ctx = (struct snmp_ctx *)context;
-	__be32 *pdata = (__be32 *)data;
+	__be32 *pdata;
 
+	if (datalen != 4)
+		return -EINVAL;
+	pdata = (__be32 *)data;
 	if (*pdata == ctx->from) {
 		pr_debug("%s: %pI4 to %pI4\n", __func__,
 			 (void *)&ctx->from, (void *)&ctx->to);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv4/route.c linux-libre-4.20.12-gnu/net/ipv4/route.c
--- linux-libre-4.20.11-gnu/net/ipv4/route.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv4/route.c	2019-02-23 03:08:07.000000000 -0500
@@ -887,13 +887,15 @@ void ip_rt_send_redirect(struct sk_buff
 	/* No redirected packets during ip_rt_redirect_silence;
 	 * reset the algorithm.
 	 */
-	if (time_after(jiffies, peer->rate_last + ip_rt_redirect_silence))
+	if (time_after(jiffies, peer->rate_last + ip_rt_redirect_silence)) {
 		peer->rate_tokens = 0;
+		peer->n_redirects = 0;
+	}
 
 	/* Too many ignored redirects; do not send anything
 	 * set dst.rate_last to the last seen redirected packet.
 	 */
-	if (peer->rate_tokens >= ip_rt_redirect_number) {
+	if (peer->n_redirects >= ip_rt_redirect_number) {
 		peer->rate_last = jiffies;
 		goto out_put_peer;
 	}
@@ -910,6 +912,7 @@ void ip_rt_send_redirect(struct sk_buff
 		icmp_send(skb, ICMP_REDIRECT, ICMP_REDIR_HOST, gw);
 		peer->rate_last = jiffies;
 		++peer->rate_tokens;
+		++peer->n_redirects;
 #ifdef CONFIG_IP_ROUTE_VERBOSE
 		if (log_martians &&
 		    peer->rate_tokens == ip_rt_redirect_number)
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv4/tcp.c linux-libre-4.20.12-gnu/net/ipv4/tcp.c
--- linux-libre-4.20.11-gnu/net/ipv4/tcp.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv4/tcp.c	2019-02-23 03:08:07.000000000 -0500
@@ -2532,6 +2532,7 @@ void tcp_write_queue_purge(struct sock *
 	sk_mem_reclaim(sk);
 	tcp_clear_all_retrans_hints(tcp_sk(sk));
 	tcp_sk(sk)->packets_out = 0;
+	inet_csk(sk)->icsk_backoff = 0;
 }
 
 int tcp_disconnect(struct sock *sk, int flags)
@@ -2580,7 +2581,6 @@ int tcp_disconnect(struct sock *sk, int
 	tp->write_seq += tp->max_window + 2;
 	if (tp->write_seq == 0)
 		tp->write_seq = 1;
-	icsk->icsk_backoff = 0;
 	tp->snd_cwnd = 2;
 	icsk->icsk_probes_out = 0;
 	tp->snd_ssthresh = TCP_INFINITE_SSTHRESH;
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv4/tcp_ipv4.c linux-libre-4.20.12-gnu/net/ipv4/tcp_ipv4.c
--- linux-libre-4.20.11-gnu/net/ipv4/tcp_ipv4.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv4/tcp_ipv4.c	2019-02-23 03:08:07.000000000 -0500
@@ -535,14 +535,15 @@ void tcp_v4_err(struct sk_buff *icmp_skb
 		if (sock_owned_by_user(sk))
 			break;
 
+		skb = tcp_rtx_queue_head(sk);
+		if (WARN_ON_ONCE(!skb))
+			break;
+
 		icsk->icsk_backoff--;
 		icsk->icsk_rto = tp->srtt_us ? __tcp_set_rto(tp) :
 					       TCP_TIMEOUT_INIT;
 		icsk->icsk_rto = inet_csk_rto_backoff(icsk, TCP_RTO_MAX);
 
-		skb = tcp_rtx_queue_head(sk);
-		BUG_ON(!skb);
-
 		tcp_mstamp_refresh(tp);
 		delta_us = (u32)(tp->tcp_mstamp - tcp_skb_timestamp_us(skb));
 		remaining = icsk->icsk_rto -
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv6/addrconf.c linux-libre-4.20.12-gnu/net/ipv6/addrconf.c
--- linux-libre-4.20.11-gnu/net/ipv6/addrconf.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv6/addrconf.c	2019-02-23 03:08:07.000000000 -0500
@@ -1165,7 +1165,8 @@ check_cleanup_prefix_route(struct inet6_
 	list_for_each_entry(ifa, &idev->addr_list, if_list) {
 		if (ifa == ifp)
 			continue;
-		if (!ipv6_prefix_equal(&ifa->addr, &ifp->addr,
+		if (ifa->prefix_len != ifp->prefix_len ||
+		    !ipv6_prefix_equal(&ifa->addr, &ifp->addr,
 				       ifp->prefix_len))
 			continue;
 		if (ifa->flags & (IFA_F_PERMANENT | IFA_F_NOPREFIXROUTE))
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/ipv6/ip6_gre.c linux-libre-4.20.12-gnu/net/ipv6/ip6_gre.c
--- linux-libre-4.20.11-gnu/net/ipv6/ip6_gre.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/ipv6/ip6_gre.c	2019-02-23 03:08:07.000000000 -0500
@@ -1717,6 +1717,24 @@ static int ip6erspan_tap_validate(struct
 	return 0;
 }
 
+static void ip6erspan_set_version(struct nlattr *data[],
+				  struct __ip6_tnl_parm *parms)
+{
+	parms->erspan_ver = 1;
+	if (data[IFLA_GRE_ERSPAN_VER])
+		parms->erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);
+
+	if (parms->erspan_ver == 1) {
+		if (data[IFLA_GRE_ERSPAN_INDEX])
+			parms->index = nla_get_u32(data[IFLA_GRE_ERSPAN_INDEX]);
+	} else if (parms->erspan_ver == 2) {
+		if (data[IFLA_GRE_ERSPAN_DIR])
+			parms->dir = nla_get_u8(data[IFLA_GRE_ERSPAN_DIR]);
+		if (data[IFLA_GRE_ERSPAN_HWID])
+			parms->hwid = nla_get_u16(data[IFLA_GRE_ERSPAN_HWID]);
+	}
+}
+
 static void ip6gre_netlink_parms(struct nlattr *data[],
 				struct __ip6_tnl_parm *parms)
 {
@@ -1765,20 +1783,6 @@ static void ip6gre_netlink_parms(struct
 
 	if (data[IFLA_GRE_COLLECT_METADATA])
 		parms->collect_md = true;
-
-	parms->erspan_ver = 1;
-	if (data[IFLA_GRE_ERSPAN_VER])
-		parms->erspan_ver = nla_get_u8(data[IFLA_GRE_ERSPAN_VER]);
-
-	if (parms->erspan_ver == 1) {
-		if (data[IFLA_GRE_ERSPAN_INDEX])
-			parms->index = nla_get_u32(data[IFLA_GRE_ERSPAN_INDEX]);
-	} else if (parms->erspan_ver == 2) {
-		if (data[IFLA_GRE_ERSPAN_DIR])
-			parms->dir = nla_get_u8(data[IFLA_GRE_ERSPAN_DIR]);
-		if (data[IFLA_GRE_ERSPAN_HWID])
-			parms->hwid = nla_get_u16(data[IFLA_GRE_ERSPAN_HWID]);
-	}
 }
 
 static int ip6gre_tap_init(struct net_device *dev)
@@ -2207,6 +2211,7 @@ static int ip6erspan_newlink(struct net
 	int err;
 
 	ip6gre_netlink_parms(data, &nt->parms);
+	ip6erspan_set_version(data, &nt->parms);
 	ign = net_generic(net, ip6gre_net_id);
 
 	if (nt->parms.collect_md) {
@@ -2252,6 +2257,7 @@ static int ip6erspan_changelink(struct n
 	if (IS_ERR(t))
 		return PTR_ERR(t);
 
+	ip6erspan_set_version(data, &p);
 	ip6gre_tunnel_unlink_md(ign, t);
 	ip6gre_tunnel_unlink(ign, t);
 	ip6erspan_tnl_change(t, &p, !tb[IFLA_MTU]);
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/packet/af_packet.c linux-libre-4.20.12-gnu/net/packet/af_packet.c
--- linux-libre-4.20.11-gnu/net/packet/af_packet.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/packet/af_packet.c	2019-02-23 03:08:07.000000000 -0500
@@ -2887,7 +2887,8 @@ static int packet_snd(struct socket *soc
 			goto out_free;
 	} else if (reserve) {
 		skb_reserve(skb, -reserve);
-		if (len < reserve)
+		if (len < reserve + sizeof(struct ipv6hdr) &&
+		    dev->min_header_len != dev->hard_header_len)
 			skb_reset_network_header(skb);
 	}
 
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/vmw_vsock/vmci_transport.c linux-libre-4.20.12-gnu/net/vmw_vsock/vmci_transport.c
--- linux-libre-4.20.11-gnu/net/vmw_vsock/vmci_transport.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/vmw_vsock/vmci_transport.c	2019-02-23 03:08:07.000000000 -0500
@@ -1651,6 +1651,10 @@ static void vmci_transport_cleanup(struc
 
 static void vmci_transport_destruct(struct vsock_sock *vsk)
 {
+	/* transport can be NULL if we hit a failure at init() time */
+	if (!vmci_trans(vsk))
+		return;
+
 	/* Ensure that the detach callback doesn't use the sk/vsk
 	 * we are about to destruct.
 	 */
diff -druNp --no-dereference linux-libre-4.20.11-gnu/net/x25/af_x25.c linux-libre-4.20.12-gnu/net/x25/af_x25.c
--- linux-libre-4.20.11-gnu/net/x25/af_x25.c	2019-02-20 04:29:16.000000000 -0500
+++ linux-libre-4.20.12-gnu/net/x25/af_x25.c	2019-02-23 03:08:07.000000000 -0500
@@ -352,17 +352,15 @@ static unsigned int x25_new_lci(struct x
 	unsigned int lci = 1;
 	struct sock *sk;
 
-	read_lock_bh(&x25_list_lock);
-
-	while ((sk = __x25_find_socket(lci, nb)) != NULL) {
+	while ((sk = x25_find_socket(lci, nb)) != NULL) {
 		sock_put(sk);
 		if (++lci == 4096) {
 			lci = 0;
 			break;
 		}
+		cond_resched();
 	}
 
-	read_unlock_bh(&x25_list_lock);
 	return lci;
 }
 
