diff -druNp --no-dereference linux-libre-3.18.98-gnu/arch/arm/mach-mvebu/Kconfig linux-libre-3.18.99-gnu/arch/arm/mach-mvebu/Kconfig
--- linux-libre-3.18.98-gnu/arch/arm/mach-mvebu/Kconfig	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/arch/arm/mach-mvebu/Kconfig	2018-03-11 11:12:20.000000000 -0400
@@ -37,7 +37,7 @@ config MACH_ARMADA_370
 config MACH_ARMADA_375
 	bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
 	select ARM_ERRATA_720789
-	select ARM_ERRATA_753970
+	select PL310_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_375_CLK
 	select HAVE_ARM_SCU
@@ -52,7 +52,7 @@ config MACH_ARMADA_375
 config MACH_ARMADA_38X
 	bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
 	select ARM_ERRATA_720789
-	select ARM_ERRATA_753970
+	select PL310_ERRATA_753970
 	select ARM_GIC
 	select ARMADA_38X_CLK
 	select HAVE_ARM_SCU
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/char/tpm/tpm_i2c_infineon.c linux-libre-3.18.99-gnu/drivers/char/tpm/tpm_i2c_infineon.c
--- linux-libre-3.18.98-gnu/drivers/char/tpm/tpm_i2c_infineon.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/char/tpm/tpm_i2c_infineon.c	2018-03-11 11:12:20.000000000 -0400
@@ -436,7 +436,8 @@ static int recv_data(struct tpm_chip *ch
 static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 {
 	int size = 0;
-	int expected, status;
+	int status;
+	u32 expected;
 
 	if (count < TPM_HEADER_SIZE) {
 		size = -EIO;
@@ -451,7 +452,7 @@ static int tpm_tis_i2c_recv(struct tpm_c
 	}
 
 	expected = be32_to_cpu(*(__be32 *)(buf + 2));
-	if ((size_t) expected > count) {
+	if (((size_t) expected > count) || (expected < TPM_HEADER_SIZE)) {
 		size = -EIO;
 		goto out;
 	}
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/char/tpm/tpm_i2c_nuvoton.c linux-libre-3.18.99-gnu/drivers/char/tpm/tpm_i2c_nuvoton.c
--- linux-libre-3.18.98-gnu/drivers/char/tpm/tpm_i2c_nuvoton.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/char/tpm/tpm_i2c_nuvoton.c	2018-03-11 11:12:20.000000000 -0400
@@ -267,7 +267,11 @@ static int i2c_nuvoton_recv(struct tpm_c
 	struct device *dev = chip->dev;
 	struct i2c_client *client = to_i2c_client(dev);
 	s32 rc;
-	int expected, status, burst_count, retries, size = 0;
+	int status;
+	int burst_count;
+	int retries;
+	int size = 0;
+	u32 expected;
 
 	if (count < TPM_HEADER_SIZE) {
 		i2c_nuvoton_ready(chip);    /* return to idle */
@@ -309,7 +313,7 @@ static int i2c_nuvoton_recv(struct tpm_c
 		 * to machine native
 		 */
 		expected = be32_to_cpu(*(__be32 *) (buf + 2));
-		if (expected > count) {
+		if (expected > count || expected < size) {
 			dev_err(dev, "%s() expected > count\n", __func__);
 			size = -EIO;
 			continue;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/cpufreq/s3c24xx-cpufreq.c linux-libre-3.18.99-gnu/drivers/cpufreq/s3c24xx-cpufreq.c
--- linux-libre-3.18.98-gnu/drivers/cpufreq/s3c24xx-cpufreq.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/cpufreq/s3c24xx-cpufreq.c	2018-03-11 11:12:20.000000000 -0400
@@ -364,7 +364,13 @@ struct clk *s3c_cpufreq_clk_get(struct d
 static int s3c_cpufreq_init(struct cpufreq_policy *policy)
 {
 	policy->clk = clk_arm;
-	return cpufreq_generic_init(policy, ftab, cpu_cur.info->latency);
+
+	policy->cpuinfo.transition_latency = cpu_cur.info->latency;
+
+	if (ftab)
+		return cpufreq_table_validate_and_show(policy, ftab);
+
+	return 0;
 }
 
 static int __init s3c_cpufreq_initclks(void)
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/leds/led-triggers.c linux-libre-3.18.99-gnu/drivers/leds/led-triggers.c
--- linux-libre-3.18.98-gnu/drivers/leds/led-triggers.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/leds/led-triggers.c	2018-03-11 11:12:20.000000000 -0400
@@ -78,21 +78,23 @@ ssize_t led_trigger_show(struct device *
 	down_read(&led_cdev->trigger_lock);
 
 	if (!led_cdev->trigger)
-		len += sprintf(buf+len, "[none] ");
+		len += scnprintf(buf+len, PAGE_SIZE - len, "[none] ");
 	else
-		len += sprintf(buf+len, "none ");
+		len += scnprintf(buf+len, PAGE_SIZE - len, "none ");
 
 	list_for_each_entry(trig, &trigger_list, next_trig) {
 		if (led_cdev->trigger && !strcmp(led_cdev->trigger->name,
 							trig->name))
-			len += sprintf(buf+len, "[%s] ", trig->name);
+			len += scnprintf(buf+len, PAGE_SIZE - len, "[%s] ",
+					 trig->name);
 		else
-			len += sprintf(buf+len, "%s ", trig->name);
+			len += scnprintf(buf+len, PAGE_SIZE - len, "%s ",
+					 trig->name);
 	}
 	up_read(&led_cdev->trigger_lock);
 	up_read(&triggers_list_lock);
 
-	len += sprintf(len+buf, "\n");
+	len += scnprintf(len+buf, PAGE_SIZE - len, "\n");
 	return len;
 }
 EXPORT_SYMBOL_GPL(led_trigger_show);
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/md/dm-io.c linux-libre-3.18.99-gnu/drivers/md/dm-io.c
--- linux-libre-3.18.98-gnu/drivers/md/dm-io.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/md/dm-io.c	2018-03-11 11:12:20.000000000 -0400
@@ -299,6 +299,7 @@ static void do_region(int rw, unsigned r
 	else if (rw & REQ_WRITE_SAME)
 		special_cmd_max_sectors = q->limits.max_write_same_sectors;
 	if ((rw & (REQ_DISCARD | REQ_WRITE_SAME)) && special_cmd_max_sectors == 0) {
+		atomic_inc(&io->count);
 		dec_count(io, region, -EOPNOTSUPP);
 		return;
 	}
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec.h linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec.h
--- linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec.h	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec.h	2018-03-11 11:12:20.000000000 -0400
@@ -546,6 +546,7 @@ struct fec_enet_private {
 };
 
 void fec_ptp_init(struct platform_device *pdev);
+void fec_ptp_stop(struct platform_device *pdev);
 void fec_ptp_start_cyclecounter(struct net_device *ndev);
 int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr);
 int fec_ptp_get(struct net_device *ndev, struct ifreq *ifr);
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec_main.c linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec_main.c
--- linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec_main.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec_main.c	2018-03-11 11:12:20.000000000 -0400
@@ -3312,6 +3312,7 @@ failed_register:
 failed_mii_init:
 failed_irq:
 failed_init:
+	fec_ptp_stop(pdev);
 	if (fep->reg_phy)
 		regulator_disable(fep->reg_phy);
 failed_regulator:
@@ -3331,14 +3332,12 @@ fec_drv_remove(struct platform_device *p
 	struct net_device *ndev = platform_get_drvdata(pdev);
 	struct fec_enet_private *fep = netdev_priv(ndev);
 
-	cancel_delayed_work_sync(&fep->time_keep);
 	cancel_work_sync(&fep->tx_timeout_work);
+	fec_ptp_stop(pdev);
 	unregister_netdev(ndev);
 	fec_enet_mii_remove(fep);
 	if (fep->reg_phy)
 		regulator_disable(fep->reg_phy);
-	if (fep->ptp_clock)
-		ptp_clock_unregister(fep->ptp_clock);
 	fec_enet_clk_enable(ndev, false);
 	of_node_put(fep->phy_node);
 	free_netdev(ndev);
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec_ptp.c linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec_ptp.c
--- linux-libre-3.18.98-gnu/drivers/net/ethernet/freescale/fec_ptp.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/net/ethernet/freescale/fec_ptp.c	2018-03-11 11:12:20.000000000 -0400
@@ -620,6 +620,16 @@ void fec_ptp_init(struct platform_device
 	schedule_delayed_work(&fep->time_keep, HZ);
 }
 
+void fec_ptp_stop(struct platform_device *pdev)
+{
+	struct net_device *ndev = platform_get_drvdata(pdev);
+	struct fec_enet_private *fep = netdev_priv(ndev);
+
+	cancel_delayed_work_sync(&fep->time_keep);
+	if (fep->ptp_clock)
+		ptp_clock_unregister(fep->ptp_clock);
+}
+
 /**
  * fec_ptp_check_pps_event
  * @fep: the fec_enet_private structure handle
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/net/ppp/ppp_generic.c linux-libre-3.18.99-gnu/drivers/net/ppp/ppp_generic.c
--- linux-libre-3.18.98-gnu/drivers/net/ppp/ppp_generic.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/net/ppp/ppp_generic.c	2018-03-11 11:12:20.000000000 -0400
@@ -2908,6 +2908,15 @@ ppp_connect_channel(struct channel *pch,
 		goto outl;
 
 	ppp_lock(ppp);
+	spin_lock_bh(&pch->downl);
+	if (!pch->chan) {
+		/* Don't connect unregistered channels */
+		spin_unlock_bh(&pch->downl);
+		ppp_unlock(ppp);
+		ret = -ENOTCONN;
+		goto outl;
+	}
+	spin_unlock_bh(&pch->downl);
 	if (pch->file.hdrlen > ppp->file.hdrlen)
 		ppp->file.hdrlen = pch->file.hdrlen;
 	hdrlen = pch->file.hdrlen + 2;	/* for protocol bytes */
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/net/wan/hdlc_ppp.c linux-libre-3.18.99-gnu/drivers/net/wan/hdlc_ppp.c
--- linux-libre-3.18.98-gnu/drivers/net/wan/hdlc_ppp.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/net/wan/hdlc_ppp.c	2018-03-11 11:12:20.000000000 -0400
@@ -574,7 +574,10 @@ static void ppp_timer(unsigned long arg)
 			ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0,
 				     0, NULL);
 			proto->restart_counter--;
-		} else
+		} else if (netif_carrier_ok(proto->dev))
+			ppp_cp_event(proto->dev, proto->pid, TO_GOOD, 0, 0,
+				     0, NULL);
+		else
 			ppp_cp_event(proto->dev, proto->pid, TO_BAD, 0, 0,
 				     0, NULL);
 		break;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/s390/net/qeth_core.h linux-libre-3.18.99-gnu/drivers/s390/net/qeth_core.h
--- linux-libre-3.18.98-gnu/drivers/s390/net/qeth_core.h	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/s390/net/qeth_core.h	2018-03-11 11:12:20.000000000 -0400
@@ -593,6 +593,11 @@ struct qeth_cmd_buffer {
 	void (*callback) (struct qeth_channel *, struct qeth_cmd_buffer *);
 };
 
+static inline struct qeth_ipa_cmd *__ipa_cmd(struct qeth_cmd_buffer *iob)
+{
+	return (struct qeth_ipa_cmd *)(iob->data + IPA_PDU_HEADER_SIZE);
+}
+
 /**
  * definition of a qeth channel, used for read and write
  */
diff -druNp --no-dereference linux-libre-3.18.98-gnu/drivers/s390/net/qeth_core_main.c linux-libre-3.18.99-gnu/drivers/s390/net/qeth_core_main.c
--- linux-libre-3.18.98-gnu/drivers/s390/net/qeth_core_main.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/drivers/s390/net/qeth_core_main.c	2018-03-11 11:12:20.000000000 -0400
@@ -2023,7 +2023,7 @@ int qeth_send_control_data(struct qeth_c
 	unsigned long flags;
 	struct qeth_reply *reply = NULL;
 	unsigned long timeout, event_timeout;
-	struct qeth_ipa_cmd *cmd;
+	struct qeth_ipa_cmd *cmd = NULL;
 
 	QETH_CARD_TEXT(card, 2, "sendctl");
 
@@ -2037,23 +2037,27 @@ int qeth_send_control_data(struct qeth_c
 	}
 	reply->callback = reply_cb;
 	reply->param = reply_param;
-	if (card->state == CARD_STATE_DOWN)
-		reply->seqno = QETH_IDX_COMMAND_SEQNO;
-	else
-		reply->seqno = card->seqno.ipa++;
+
 	init_waitqueue_head(&reply->wait_q);
-	spin_lock_irqsave(&card->lock, flags);
-	list_add_tail(&reply->list, &card->cmd_waiter_list);
-	spin_unlock_irqrestore(&card->lock, flags);
 	QETH_DBF_HEX(CTRL, 2, iob->data, QETH_DBF_CTRL_LEN);
 
 	while (atomic_cmpxchg(&card->write.irq_pending, 0, 1)) ;
-	qeth_prepare_control_data(card, len, iob);
 
-	if (IS_IPA(iob->data))
+	if (IS_IPA(iob->data)) {
+		cmd = __ipa_cmd(iob);
+		cmd->hdr.seqno = card->seqno.ipa++;
+		reply->seqno = cmd->hdr.seqno;
 		event_timeout = QETH_IPA_TIMEOUT;
-	else
+	} else {
+		reply->seqno = QETH_IDX_COMMAND_SEQNO;
 		event_timeout = QETH_TIMEOUT;
+	}
+	qeth_prepare_control_data(card, len, iob);
+
+	spin_lock_irqsave(&card->lock, flags);
+	list_add_tail(&reply->list, &card->cmd_waiter_list);
+	spin_unlock_irqrestore(&card->lock, flags);
+
 	timeout = jiffies + event_timeout;
 
 	QETH_CARD_TEXT(card, 6, "noirqpnd");
@@ -2078,9 +2082,8 @@ int qeth_send_control_data(struct qeth_c
 
 	/* we have only one long running ipassist, since we can ensure
 	   process context of this command we can sleep */
-	cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE);
-	if ((cmd->hdr.command == IPA_CMD_SETIP) &&
-	    (cmd->hdr.prot_version == QETH_PROT_IPV4)) {
+	if (cmd && cmd->hdr.command == IPA_CMD_SETIP &&
+	    cmd->hdr.prot_version == QETH_PROT_IPV4) {
 		if (!wait_event_timeout(reply->wait_q,
 		    atomic_read(&reply->received), event_timeout))
 			goto time_err;
@@ -2887,7 +2890,7 @@ static void qeth_fill_ipacmd_header(stru
 	memset(cmd, 0, sizeof(struct qeth_ipa_cmd));
 	cmd->hdr.command = command;
 	cmd->hdr.initiator = IPA_CMD_INITIATOR_HOST;
-	cmd->hdr.seqno = card->seqno.ipa;
+	/* cmd->hdr.seqno is set by qeth_send_control_data() */
 	cmd->hdr.adapter_type = qeth_get_ipa_adp_type(card->info.link_type);
 	cmd->hdr.rel_adapter_no = (__u8) card->info.portno;
 	if (card->options.layer2)
diff -druNp --no-dereference linux-libre-3.18.98-gnu/include/net/udplite.h linux-libre-3.18.99-gnu/include/net/udplite.h
--- linux-libre-3.18.98-gnu/include/net/udplite.h	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/include/net/udplite.h	2018-03-11 11:12:20.000000000 -0400
@@ -61,6 +61,7 @@ static inline int udplite_checksum_init(
 		UDP_SKB_CB(skb)->cscov = cscov;
 		if (skb->ip_summed == CHECKSUM_COMPLETE)
 			skb->ip_summed = CHECKSUM_NONE;
+		skb->csum_valid = 0;
         }
 
 	return 0;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/Makefile linux-libre-3.18.99-gnu/Makefile
--- linux-libre-3.18.98-gnu/Makefile	2018-03-04 14:07:24.000000000 -0500
+++ linux-libre-3.18.99-gnu/Makefile	2018-03-11 14:31:26.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 98
+SUBLEVEL = 99
 EXTRAVERSION =-gnu
 NAME = Diseased Newt
 
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/bridge/br_sysfs_if.c linux-libre-3.18.99-gnu/net/bridge/br_sysfs_if.c
--- linux-libre-3.18.98-gnu/net/bridge/br_sysfs_if.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/bridge/br_sysfs_if.c	2018-03-11 11:12:20.000000000 -0400
@@ -225,6 +225,9 @@ static ssize_t brport_show(struct kobjec
 	struct brport_attribute *brport_attr = to_brport_attr(attr);
 	struct net_bridge_port *p = to_brport(kobj);
 
+	if (!brport_attr->show)
+		return -EINVAL;
+
 	return brport_attr->show(p, buf);
 }
 
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/core/dev.c linux-libre-3.18.99-gnu/net/core/dev.c
--- linux-libre-3.18.98-gnu/net/core/dev.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/core/dev.c	2018-03-11 11:12:20.000000000 -0400
@@ -2070,8 +2070,11 @@ EXPORT_SYMBOL(netif_set_xps_queue);
  */
 int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)
 {
+	bool disabling;
 	int rc;
 
+	disabling = txq < dev->real_num_tx_queues;
+
 	if (txq < 1 || txq > dev->num_tx_queues)
 		return -EINVAL;
 
@@ -2087,15 +2090,19 @@ int netif_set_real_num_tx_queues(struct
 		if (dev->num_tc)
 			netif_setup_tc(dev, txq);
 
-		if (txq < dev->real_num_tx_queues) {
+		dev->real_num_tx_queues = txq;
+
+		if (disabling) {
+			synchronize_net();
 			qdisc_reset_all_tx_gt(dev, txq);
 #ifdef CONFIG_XPS
 			netif_reset_xps_queues_gt(dev, txq);
 #endif
 		}
+	} else {
+		dev->real_num_tx_queues = txq;
 	}
 
-	dev->real_num_tx_queues = txq;
 	return 0;
 }
 EXPORT_SYMBOL(netif_set_real_num_tx_queues);
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/ipv4/fib_semantics.c linux-libre-3.18.99-gnu/net/ipv4/fib_semantics.c
--- linux-libre-3.18.98-gnu/net/ipv4/fib_semantics.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/ipv4/fib_semantics.c	2018-03-11 11:12:20.000000000 -0400
@@ -514,6 +514,11 @@ int fib_nh_match(struct fib_config *cfg,
 		return 1;
 
 	if (cfg->fc_oif || cfg->fc_gw) {
+#ifdef CONFIG_IP_ROUTE_CLASSID
+		if (cfg->fc_flow &&
+		    cfg->fc_flow != fi->fib_nh->nh_tclassid)
+			return 1;
+#endif
 		if ((!cfg->fc_oif || cfg->fc_oif == fi->fib_nh->nh_oif) &&
 		    (!cfg->fc_gw  || cfg->fc_gw == fi->fib_nh->nh_gw))
 			return 0;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/ipv4/route.c linux-libre-3.18.99-gnu/net/ipv4/route.c
--- linux-libre-3.18.98-gnu/net/ipv4/route.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/ipv4/route.c	2018-03-11 11:12:20.000000000 -0400
@@ -122,9 +122,11 @@ static int ip_rt_redirect_silence __read
 static int ip_rt_error_cost __read_mostly	= HZ;
 static int ip_rt_error_burst __read_mostly	= 5 * HZ;
 static int ip_rt_mtu_expires __read_mostly	= 10 * 60 * HZ;
-static int ip_rt_min_pmtu __read_mostly		= 512 + 20 + 20;
+static u32 ip_rt_min_pmtu __read_mostly		= 512 + 20 + 20;
 static int ip_rt_min_advmss __read_mostly	= 256;
 
+static int ip_min_valid_pmtu __read_mostly	= IPV4_MIN_MTU;
+
 /*
  *	Interface to generic destination cache.
  */
@@ -2629,7 +2631,8 @@ static struct ctl_table ipv4_route_table
 		.data		= &ip_rt_min_pmtu,
 		.maxlen		= sizeof(int),
 		.mode		= 0644,
-		.proc_handler	= proc_dointvec,
+		.proc_handler	= proc_dointvec_minmax,
+		.extra1		= &ip_min_valid_pmtu,
 	},
 	{
 		.procname	= "min_adv_mss",
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/ipv4/udp.c linux-libre-3.18.99-gnu/net/ipv4/udp.c
--- linux-libre-3.18.98-gnu/net/ipv4/udp.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/ipv4/udp.c	2018-03-11 11:12:20.000000000 -0400
@@ -1718,6 +1718,11 @@ static inline int udp4_csum_init(struct
 		err = udplite_checksum_init(skb, uh);
 		if (err)
 			return err;
+
+		if (UDP_SKB_CB(skb)->partial_cov) {
+			skb->csum = inet_compute_pseudo(skb, proto);
+			return 0;
+		}
 	}
 
 	return skb_checksum_init_zero_check(skb, proto, uh->check,
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/ipv6/ip6_checksum.c linux-libre-3.18.99-gnu/net/ipv6/ip6_checksum.c
--- linux-libre-3.18.98-gnu/net/ipv6/ip6_checksum.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/ipv6/ip6_checksum.c	2018-03-11 11:12:20.000000000 -0400
@@ -73,6 +73,11 @@ int udp6_csum_init(struct sk_buff *skb,
 		err = udplite_checksum_init(skb, uh);
 		if (err)
 			return err;
+
+		if (UDP_SKB_CB(skb)->partial_cov) {
+			skb->csum = ip6_compute_pseudo(skb, proto);
+			return 0;
+		}
 	}
 
 	/* To support RFC 6936 (allow zero checksum in UDP/IPV6 for tunnels)
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/ipv6/sit.c linux-libre-3.18.99-gnu/net/ipv6/sit.c
--- linux-libre-3.18.98-gnu/net/ipv6/sit.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/ipv6/sit.c	2018-03-11 11:12:20.000000000 -0400
@@ -176,7 +176,7 @@ static void ipip6_tunnel_clone_6rd(struc
 #ifdef CONFIG_IPV6_SIT_6RD
 	struct ip_tunnel *t = netdev_priv(dev);
 
-	if (t->dev == sitn->fb_tunnel_dev) {
+	if (dev == sitn->fb_tunnel_dev) {
 		ipv6_addr_set(&t->ip6rd.prefix, htonl(0x20020000), 0, 0, 0);
 		t->ip6rd.relay_prefix = 0;
 		t->ip6rd.prefixlen = 16;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/netlink/genetlink.c linux-libre-3.18.99-gnu/net/netlink/genetlink.c
--- linux-libre-3.18.98-gnu/net/netlink/genetlink.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/netlink/genetlink.c	2018-03-11 11:12:20.000000000 -0400
@@ -1058,6 +1058,7 @@ static int genlmsg_mcast(struct sk_buff
 {
 	struct sk_buff *tmp;
 	struct net *net, *prev = NULL;
+	bool delivered = false;
 	int err;
 
 	for_each_net_rcu(net) {
@@ -1069,14 +1070,21 @@ static int genlmsg_mcast(struct sk_buff
 			}
 			err = nlmsg_multicast(prev->genl_sock, tmp,
 					      portid, group, flags);
-			if (err)
+			if (!err)
+				delivered = true;
+			else if (err != -ESRCH)
 				goto error;
 		}
 
 		prev = net;
 	}
 
-	return nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
+	err = nlmsg_multicast(prev->genl_sock, skb, portid, group, flags);
+	if (!err)
+		delivered = true;
+	else if (err != -ESRCH)
+		goto error;
+	return delivered ? 0 : -ESRCH;
  error:
 	kfree_skb(skb);
 	return err;
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/sctp/ipv6.c linux-libre-3.18.99-gnu/net/sctp/ipv6.c
--- linux-libre-3.18.98-gnu/net/sctp/ipv6.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/sctp/ipv6.c	2018-03-11 11:12:20.000000000 -0400
@@ -323,8 +323,10 @@ static void sctp_v6_get_dst(struct sctp_
 		final_p = fl6_update_dst(fl6, rcu_dereference(np->opt), &final);
 		bdst = ip6_dst_lookup_flow(sk, fl6, final_p);
 
-		if (!IS_ERR(bdst) &&
-		    ipv6_chk_addr(dev_net(bdst->dev),
+		if (IS_ERR(bdst))
+			continue;
+
+		if (ipv6_chk_addr(dev_net(bdst->dev),
 				  &laddr->a.v6.sin6_addr, bdst->dev, 1)) {
 			if (!IS_ERR_OR_NULL(dst))
 				dst_release(dst);
@@ -333,8 +335,10 @@ static void sctp_v6_get_dst(struct sctp_
 		}
 
 		bmatchlen = sctp_v6_addr_match_len(daddr, &laddr->a);
-		if (matchlen > bmatchlen)
+		if (matchlen > bmatchlen) {
+			dst_release(bdst);
 			continue;
+		}
 
 		if (!IS_ERR_OR_NULL(dst))
 			dst_release(dst);
diff -druNp --no-dereference linux-libre-3.18.98-gnu/net/sctp/sm_make_chunk.c linux-libre-3.18.99-gnu/net/sctp/sm_make_chunk.c
--- linux-libre-3.18.98-gnu/net/sctp/sm_make_chunk.c	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/net/sctp/sm_make_chunk.c	2018-03-11 11:12:20.000000000 -0400
@@ -1367,10 +1367,14 @@ static struct sctp_chunk *_sctp_make_chu
 	sctp_chunkhdr_t *chunk_hdr;
 	struct sk_buff *skb;
 	struct sock *sk;
+	int chunklen;
+
+	chunklen = sizeof(*chunk_hdr) + paylen;
+	if (chunklen > SCTP_MAX_CHUNK_LEN)
+		goto nodata;
 
 	/* No need to allocate LL here, as this is only a chunk. */
-	skb = alloc_skb(WORD_ROUND(sizeof(sctp_chunkhdr_t) + paylen),
-			GFP_ATOMIC);
+	skb = alloc_skb(chunklen, GFP_ATOMIC);
 	if (!skb)
 		goto nodata;
 
diff -druNp --no-dereference linux-libre-3.18.98-gnu/sound/usb/quirks-table.h linux-libre-3.18.99-gnu/sound/usb/quirks-table.h
--- linux-libre-3.18.98-gnu/sound/usb/quirks-table.h	2018-03-03 04:17:11.000000000 -0500
+++ linux-libre-3.18.99-gnu/sound/usb/quirks-table.h	2018-03-11 11:12:20.000000000 -0400
@@ -3312,4 +3312,51 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge
 	}
 },
 
+{
+	/*
+	 * Bower's & Wilkins PX headphones only support the 48 kHz sample rate
+	 * even though it advertises more. The capture interface doesn't work
+	 * even on windows.
+	 */
+	USB_DEVICE(0x19b5, 0x0021),
+	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
+		.ifnum = QUIRK_ANY_INTERFACE,
+		.type = QUIRK_COMPOSITE,
+		.data = (const struct snd_usb_audio_quirk[]) {
+			{
+				.ifnum = 0,
+				.type = QUIRK_AUDIO_STANDARD_MIXER,
+			},
+			/* Capture */
+			{
+				.ifnum = 1,
+				.type = QUIRK_IGNORE_INTERFACE,
+			},
+			/* Playback */
+			{
+				.ifnum = 2,
+				.type = QUIRK_AUDIO_FIXED_ENDPOINT,
+				.data = &(const struct audioformat) {
+					.formats = SNDRV_PCM_FMTBIT_S16_LE,
+					.channels = 2,
+					.iface = 2,
+					.altsetting = 1,
+					.altset_idx = 1,
+					.attributes = UAC_EP_CS_ATTR_FILL_MAX |
+						UAC_EP_CS_ATTR_SAMPLE_RATE,
+					.endpoint = 0x03,
+					.ep_attr = USB_ENDPOINT_XFER_ISOC,
+					.rates = SNDRV_PCM_RATE_48000,
+					.rate_min = 48000,
+					.rate_max = 48000,
+					.nr_rates = 1,
+					.rate_table = (unsigned int[]) {
+						48000
+					}
+				}
+			},
+		}
+	}
+},
+
 #undef USB_DEVICE_VENDOR_SPEC
