diff -druNp --no-dereference linux-libre-3.4.76-gnu1/arch/arm/kernel/traps.c linux-libre-3.4.77-gnu1/arch/arm/kernel/traps.c
--- linux-libre-3.4.76-gnu1/arch/arm/kernel/traps.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/arch/arm/kernel/traps.c	2014-01-15 18:27:19.000000000 -0500
@@ -37,7 +37,13 @@
 
 #include "signal.h"
 
-static const char *handler[]= { "prefetch abort", "data abort", "address exception", "interrupt" };
+static const char *handler[]= {
+	"prefetch abort",
+	"data abort",
+	"address exception",
+	"interrupt",
+	"undefined instruction",
+};
 
 void *vectors_page;
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/arch/arm/mach-shmobile/board-mackerel.c linux-libre-3.4.77-gnu1/arch/arm/mach-shmobile/board-mackerel.c
--- linux-libre-3.4.76-gnu1/arch/arm/mach-shmobile/board-mackerel.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/arch/arm/mach-shmobile/board-mackerel.c	2014-01-15 18:27:19.000000000 -0500
@@ -422,7 +422,7 @@ static struct platform_device lcdc_devic
 	.resource	= lcdc_resources,
 	.dev	= {
 		.platform_data	= &lcdc_info,
-		.coherent_dma_mask = ~0,
+		.coherent_dma_mask = DMA_BIT_MASK(32),
 	},
 };
 
@@ -498,7 +498,7 @@ static struct platform_device hdmi_lcdc_
 	.id		= 1,
 	.dev	= {
 		.platform_data	= &hdmi_lcdc_info,
-		.coherent_dma_mask = ~0,
+		.coherent_dma_mask = DMA_BIT_MASK(32),
 	},
 };
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/arch/x86/include/asm/fpu-internal.h linux-libre-3.4.77-gnu1/arch/x86/include/asm/fpu-internal.h
--- linux-libre-3.4.76-gnu1/arch/x86/include/asm/fpu-internal.h	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/arch/x86/include/asm/fpu-internal.h	2014-01-15 18:27:19.000000000 -0500
@@ -266,12 +266,13 @@ static inline int restore_fpu_checking(s
 	/* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
 	   is pending.  Clear the x87 state here by setting it to fixed
 	   values. "m" is a random variable that should be in L1 */
-	alternative_input(
-		ASM_NOP8 ASM_NOP2,
-		"emms\n\t"		/* clear stack tags */
-		"fildl %P[addr]",	/* set F?P to defined value */
-		X86_FEATURE_FXSAVE_LEAK,
-		[addr] "m" (tsk->thread.fpu.has_fpu));
+	if (unlikely(static_cpu_has(X86_FEATURE_FXSAVE_LEAK))) {
+		asm volatile(
+			"fnclex\n\t"
+			"emms\n\t"
+			"fildl %P[addr]"	/* set F?P to defined value */
+			: : [addr] "m" (tsk->thread.fpu.has_fpu));
+	}
 
 	return fpu_restore_checking(&tsk->thread.fpu);
 }
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/broadcom/tg3.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/broadcom/tg3.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/broadcom/tg3.c	2014-01-08 18:36:37.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/broadcom/tg3.c	2014-01-15 20:50:37.000000000 -0500
@@ -14662,6 +14662,9 @@ static int __devinit tg3_get_invariants(
 	/* Clear this out for sanity. */
 	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
 
+	/* Clear TG3PCI_REG_BASE_ADDR to prevent hangs. */
+	tw32(TG3PCI_REG_BASE_ADDR, 0);
+
 	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE,
 			      &pci_state_reg);
 	if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0 &&
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/calxeda/xgmac.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/calxeda/xgmac.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/calxeda/xgmac.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/calxeda/xgmac.c	2014-01-15 18:27:19.000000000 -0500
@@ -1776,7 +1776,7 @@ static int xgmac_probe(struct platform_d
 	if (device_can_wakeup(priv->device))
 		priv->wolopts = WAKE_MAGIC;	/* Magic Frame as default */
 
-	ndev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA;
+	ndev->hw_features = NETIF_F_SG | NETIF_F_HIGHDMA;
 	if (readl(priv->base + XGMAC_DMA_HW_FEATURE) & DMA_HW_FEAT_TXCOESEL)
 		ndev->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM |
 				     NETIF_F_RXCSUM;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/ibm/ehea/ehea_main.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/ibm/ehea/ehea_main.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/ibm/ehea/ehea_main.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/ibm/ehea/ehea_main.c	2014-01-15 18:27:19.000000000 -0500
@@ -3029,7 +3029,7 @@ static struct ehea_port *ehea_setup_sing
 
 	dev->hw_features = NETIF_F_SG | NETIF_F_TSO
 		      | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_LRO;
-	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
+	dev->features = NETIF_F_SG | NETIF_F_TSO
 		      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
 		      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
 		      | NETIF_F_RXCSUM;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/tehuti/tehuti.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/tehuti/tehuti.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/tehuti/tehuti.c	2014-01-08 18:36:29.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/tehuti/tehuti.c	2014-01-15 20:50:29.000000000 -0500
@@ -1995,7 +1995,6 @@ bdx_probe(struct pci_dev *pdev, const st
 		ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO
 		    | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
 		    NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM
-		    /*| NETIF_F_FRAGLIST */
 		    ;
 		ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG |
 			NETIF_F_TSO | NETIF_F_HW_VLAN_TX;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/xilinx/ll_temac_main.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/xilinx/ll_temac_main.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/xilinx/ll_temac_main.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/xilinx/ll_temac_main.c	2014-01-15 18:27:19.000000000 -0500
@@ -1026,7 +1026,7 @@ static int __devinit temac_of_probe(stru
 	dev_set_drvdata(&op->dev, ndev);
 	SET_NETDEV_DEV(ndev, &op->dev);
 	ndev->flags &= ~IFF_MULTICAST;  /* clear multicast */
-	ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST;
+	ndev->features = NETIF_F_SG;
 	ndev->netdev_ops = &temac_netdev_ops;
 	ndev->ethtool_ops = &temac_ethtool_ops;
 #if 0
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/ethernet/xilinx/xilinx_axienet_main.c linux-libre-3.4.77-gnu1/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
--- linux-libre-3.4.76-gnu1/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/ethernet/xilinx/xilinx_axienet_main.c	2014-01-15 18:27:19.000000000 -0500
@@ -1494,7 +1494,7 @@ static int __devinit axienet_of_probe(st
 
 	SET_NETDEV_DEV(ndev, &op->dev);
 	ndev->flags &= ~IFF_MULTICAST;  /* clear multicast */
-	ndev->features = NETIF_F_SG | NETIF_F_FRAGLIST;
+	ndev->features = NETIF_F_SG;
 	ndev->netdev_ops = &axienet_netdev_ops;
 	ndev->ethtool_ops = &axienet_ethtool_ops;
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/hamradio/hdlcdrv.c linux-libre-3.4.77-gnu1/drivers/net/hamradio/hdlcdrv.c
--- linux-libre-3.4.76-gnu1/drivers/net/hamradio/hdlcdrv.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/hamradio/hdlcdrv.c	2014-01-15 18:27:19.000000000 -0500
@@ -571,6 +571,8 @@ static int hdlcdrv_ioctl(struct net_devi
 	case HDLCDRVCTL_CALIBRATE:
 		if(!capable(CAP_SYS_RAWIO))
 			return -EPERM;
+		if (bi.data.calibrate > INT_MAX / s->par.bitrate)
+			return -EINVAL;
 		s->hdlctx.calibrate = bi.data.calibrate * s->par.bitrate / 16;
 		return 0;
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/hamradio/yam.c linux-libre-3.4.77-gnu1/drivers/net/hamradio/yam.c
--- linux-libre-3.4.76-gnu1/drivers/net/hamradio/yam.c	2014-01-08 18:36:48.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/hamradio/yam.c	2014-01-15 20:50:47.000000000 -0500
@@ -1058,6 +1058,7 @@ static int yam_ioctl(struct net_device *
 		break;
 
 	case SIOCYAMGCFG:
+		memset(&yi, 0, sizeof(yi));
 		yi.cfg.mask = 0xffffffff;
 		yi.cfg.iobase = yp->iobase;
 		yi.cfg.irq = yp->irq;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/hyperv/netvsc_drv.c linux-libre-3.4.77-gnu1/drivers/net/hyperv/netvsc_drv.c
--- linux-libre-3.4.76-gnu1/drivers/net/hyperv/netvsc_drv.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/hyperv/netvsc_drv.c	2014-01-15 18:27:19.000000000 -0500
@@ -321,7 +321,6 @@ static int netvsc_change_mtu(struct net_
 		return -EINVAL;
 
 	nvdev->start_remove = true;
-	cancel_delayed_work_sync(&ndevctx->dwork);
 	cancel_work_sync(&ndevctx->work);
 	netif_tx_disable(ndev);
 	rndis_filter_device_remove(hdev);
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/macvtap.c linux-libre-3.4.77-gnu1/drivers/net/macvtap.c
--- linux-libre-3.4.76-gnu1/drivers/net/macvtap.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/macvtap.c	2014-01-15 18:27:19.000000000 -0500
@@ -797,11 +797,10 @@ static ssize_t macvtap_put_user(struct m
 				const struct sk_buff *skb,
 				const struct iovec *iv, int len)
 {
-	struct macvlan_dev *vlan;
 	int ret;
 	int vnet_hdr_len = 0;
 	int vlan_offset = 0;
-	int copied;
+	int copied, total;
 
 	if (q->flags & IFF_VNET_HDR) {
 		struct virtio_net_hdr vnet_hdr;
@@ -816,7 +815,8 @@ static ssize_t macvtap_put_user(struct m
 		if (memcpy_toiovecend(iv, (void *)&vnet_hdr, 0, sizeof(vnet_hdr)))
 			return -EFAULT;
 	}
-	copied = vnet_hdr_len;
+	total = copied = vnet_hdr_len;
+	total += skb->len;
 
 	if (!vlan_tx_tag_present(skb))
 		len = min_t(int, skb->len, len);
@@ -831,6 +831,7 @@ static ssize_t macvtap_put_user(struct m
 
 		vlan_offset = offsetof(struct vlan_ethhdr, h_vlan_proto);
 		len = min_t(int, skb->len + VLAN_HLEN, len);
+		total += VLAN_HLEN;
 
 		copy = min_t(int, vlan_offset, len);
 		ret = skb_copy_datagram_const_iovec(skb, 0, iv, copied, copy);
@@ -848,16 +849,9 @@ static ssize_t macvtap_put_user(struct m
 	}
 
 	ret = skb_copy_datagram_const_iovec(skb, vlan_offset, iv, copied, len);
-	copied += len;
 
 done:
-	rcu_read_lock_bh();
-	vlan = rcu_dereference_bh(q->vlan);
-	if (vlan)
-		macvlan_count_rx(vlan, copied - vnet_hdr_len, ret == 0, 0);
-	rcu_read_unlock_bh();
-
-	return ret ? ret : copied;
+	return ret ? ret : total;
 }
 
 static ssize_t macvtap_do_read(struct macvtap_queue *q, struct kiocb *iocb,
@@ -911,7 +905,9 @@ static ssize_t macvtap_aio_read(struct k
 	}
 
 	ret = macvtap_do_read(q, iocb, iv, len, file->f_flags & O_NONBLOCK);
-	ret = min_t(ssize_t, ret, len); /* XXX copied from tun.c. Why? */
+	ret = min_t(ssize_t, ret, len);
+	if (ret > 0)
+		iocb->ki_pos = ret;
 out:
 	return ret;
 }
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/drivers/net/tun.c linux-libre-3.4.77-gnu1/drivers/net/tun.c
--- linux-libre-3.4.76-gnu1/drivers/net/tun.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/drivers/net/tun.c	2014-01-15 18:27:19.000000000 -0500
@@ -903,6 +903,8 @@ static ssize_t tun_chr_aio_read(struct k
 
 	ret = tun_do_read(tun, iocb, iv, len, file->f_flags & O_NONBLOCK);
 	ret = min_t(ssize_t, ret, len);
+	if (ret > 0)
+		iocb->ki_pos = ret;
 out:
 	tun_put(tun);
 	return ret;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/include/linux/netdevice.h linux-libre-3.4.77-gnu1/include/linux/netdevice.h
--- linux-libre-3.4.76-gnu1/include/linux/netdevice.h	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/include/linux/netdevice.h	2014-01-15 18:27:19.000000000 -0500
@@ -1702,6 +1702,15 @@ static inline int dev_parse_header(const
 	return dev->header_ops->parse(skb, haddr);
 }
 
+static inline int dev_rebuild_header(struct sk_buff *skb)
+{
+	const struct net_device *dev = skb->dev;
+
+	if (!dev->header_ops || !dev->header_ops->rebuild)
+		return 0;
+	return dev->header_ops->rebuild(skb);
+}
+
 typedef int gifconf_func_t(struct net_device * dev, char __user * bufptr, int len);
 extern int		register_gifconf(unsigned int family, gifconf_func_t * gifconf);
 static inline int unregister_gifconf(unsigned int family)
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/include/linux/net.h linux-libre-3.4.77-gnu1/include/linux/net.h
--- linux-libre-3.4.76-gnu1/include/linux/net.h	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/include/linux/net.h	2014-01-15 18:27:19.000000000 -0500
@@ -215,7 +215,7 @@ struct proto_ops {
 				      int offset, size_t size, int flags);
 	ssize_t 	(*splice_read)(struct socket *sock,  loff_t *ppos,
 				       struct pipe_inode_info *pipe, size_t len, unsigned int flags);
-	void		(*set_peek_off)(struct sock *sk, int val);
+	int		(*set_peek_off)(struct sock *sk, int val);
 };
 
 #define DECLARE_SOCKADDR(type, dst, src)	\
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/kernel/sched/core.c linux-libre-3.4.77-gnu1/kernel/sched/core.c
--- linux-libre-3.4.76-gnu1/kernel/sched/core.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/kernel/sched/core.c	2014-01-15 18:27:19.000000000 -0500
@@ -7906,7 +7906,12 @@ static int tg_set_cfs_bandwidth(struct t
 
 	runtime_enabled = quota != RUNTIME_INF;
 	runtime_was_enabled = cfs_b->quota != RUNTIME_INF;
-	account_cfs_bandwidth_used(runtime_enabled, runtime_was_enabled);
+	/*
+	 * If we need to toggle cfs_bandwidth_used, off->on must occur
+	 * before making related changes, and on->off must occur afterwards
+	 */
+	if (runtime_enabled && !runtime_was_enabled)
+		cfs_bandwidth_usage_inc();
 	raw_spin_lock_irq(&cfs_b->lock);
 	cfs_b->period = ns_to_ktime(period);
 	cfs_b->quota = quota;
@@ -7932,6 +7937,8 @@ static int tg_set_cfs_bandwidth(struct t
 			unthrottle_cfs_rq(cfs_rq);
 		raw_spin_unlock_irq(&rq->lock);
 	}
+	if (runtime_was_enabled && !runtime_enabled)
+		cfs_bandwidth_usage_dec();
 out_unlock:
 	mutex_unlock(&cfs_constraints_mutex);
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/kernel/sched/fair.c linux-libre-3.4.77-gnu1/kernel/sched/fair.c
--- linux-libre-3.4.76-gnu1/kernel/sched/fair.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/kernel/sched/fair.c	2014-01-15 18:27:19.000000000 -0500
@@ -1393,13 +1393,14 @@ static inline bool cfs_bandwidth_used(vo
 	return static_key_false(&__cfs_bandwidth_used);
 }
 
-void account_cfs_bandwidth_used(int enabled, int was_enabled)
+void cfs_bandwidth_usage_inc(void)
 {
-	/* only need to count groups transitioning between enabled/!enabled */
-	if (enabled && !was_enabled)
-		static_key_slow_inc(&__cfs_bandwidth_used);
-	else if (!enabled && was_enabled)
-		static_key_slow_dec(&__cfs_bandwidth_used);
+	static_key_slow_inc(&__cfs_bandwidth_used);
+}
+
+void cfs_bandwidth_usage_dec(void)
+{
+	static_key_slow_dec(&__cfs_bandwidth_used);
 }
 #else /* HAVE_JUMP_LABEL */
 static bool cfs_bandwidth_used(void)
@@ -1407,7 +1408,8 @@ static bool cfs_bandwidth_used(void)
 	return true;
 }
 
-void account_cfs_bandwidth_used(int enabled, int was_enabled) {}
+void cfs_bandwidth_usage_inc(void) {}
+void cfs_bandwidth_usage_dec(void) {}
 #endif /* HAVE_JUMP_LABEL */
 
 /*
@@ -1769,6 +1771,13 @@ static int do_sched_cfs_period_timer(str
 	if (idle)
 		goto out_unlock;
 
+	/*
+	 * if we have relooped after returning idle once, we need to update our
+	 * status as actually running, so that other cpus doing
+	 * __start_cfs_bandwidth will stop trying to cancel us.
+	 */
+	cfs_b->timer_active = 1;
+
 	__refill_cfs_bandwidth_runtime(cfs_b);
 
 	if (!throttled) {
@@ -1829,7 +1838,13 @@ static const u64 min_bandwidth_expiratio
 /* how long we wait to gather additional slack before distributing */
 static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC;
 
-/* are we near the end of the current quota period? */
+/*
+ * Are we near the end of the current quota period?
+ *
+ * Requires cfs_b->lock for hrtimer_expires_remaining to be safe against the
+ * hrtimer base being cleared by __hrtimer_start_range_ns. In the case of
+ * migrate_hrtimers, base is never cleared, so we are fine.
+ */
 static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire)
 {
 	struct hrtimer *refresh_timer = &cfs_b->period_timer;
@@ -1905,10 +1920,12 @@ static void do_sched_cfs_slack_timer(str
 	u64 expires;
 
 	/* confirm we're still not at a refresh boundary */
-	if (runtime_refresh_within(cfs_b, min_bandwidth_expiration))
+	raw_spin_lock(&cfs_b->lock);
+	if (runtime_refresh_within(cfs_b, min_bandwidth_expiration)) {
+		raw_spin_unlock(&cfs_b->lock);
 		return;
+	}
 
-	raw_spin_lock(&cfs_b->lock);
 	if (cfs_b->quota != RUNTIME_INF && cfs_b->runtime > slice) {
 		runtime = cfs_b->runtime;
 		cfs_b->runtime = 0;
@@ -2033,11 +2050,11 @@ void __start_cfs_bandwidth(struct cfs_ba
 	 * (timer_active==0 becomes visible before the hrtimer call-back
 	 * terminates).  In either case we ensure that it's re-programmed
 	 */
-	while (unlikely(hrtimer_active(&cfs_b->period_timer))) {
+	while (unlikely(hrtimer_active(&cfs_b->period_timer)) &&
+	       hrtimer_try_to_cancel(&cfs_b->period_timer) < 0) {
+		/* bounce the lock to allow do_sched_cfs_period_timer to run */
 		raw_spin_unlock(&cfs_b->lock);
-		/* ensure cfs_b->lock is available while we wait */
-		hrtimer_cancel(&cfs_b->period_timer);
-
+		cpu_relax();
 		raw_spin_lock(&cfs_b->lock);
 		/* if someone else restarted the timer then we're done */
 		if (cfs_b->timer_active)
@@ -5453,7 +5470,8 @@ void init_tg_cfs_entry(struct task_group
 		se->cfs_rq = parent->my_q;
 
 	se->my_q = cfs_rq;
-	update_load_set(&se->load, 0);
+	/* guarantee group entities always have weight */
+	update_load_set(&se->load, NICE_0_LOAD);
 	se->parent = parent;
 }
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/kernel/sched/sched.h linux-libre-3.4.77-gnu1/kernel/sched/sched.h
--- linux-libre-3.4.76-gnu1/kernel/sched/sched.h	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/kernel/sched/sched.h	2014-01-15 18:27:19.000000000 -0500
@@ -1140,7 +1140,8 @@ extern void init_cfs_rq(struct cfs_rq *c
 extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq);
 extern void unthrottle_offline_cfs_rqs(struct rq *rq);
 
-extern void account_cfs_bandwidth_used(int enabled, int was_enabled);
+extern void cfs_bandwidth_usage_inc(void);
+extern void cfs_bandwidth_usage_dec(void);
 
 #ifdef CONFIG_NO_HZ
 enum rq_nohz_flag_bits {
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/Makefile linux-libre-3.4.77-gnu1/Makefile
--- linux-libre-3.4.76-gnu1/Makefile	2014-01-08 18:31:13.000000000 -0500
+++ linux-libre-3.4.77-gnu1/Makefile	2014-01-15 20:45:06.000000000 -0500
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 4
-SUBLEVEL = 76
+SUBLEVEL = 77
 EXTRAVERSION =-gnu1
 NAME = Saber-toothed Squirrel
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/8021q/vlan_dev.c linux-libre-3.4.77-gnu1/net/8021q/vlan_dev.c
--- linux-libre-3.4.76-gnu1/net/8021q/vlan_dev.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/8021q/vlan_dev.c	2014-01-15 18:27:19.000000000 -0500
@@ -525,6 +525,23 @@ static const struct header_ops vlan_head
 	.parse	 = eth_header_parse,
 };
 
+static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev,
+				     unsigned short type,
+				     const void *daddr, const void *saddr,
+				     unsigned int len)
+{
+	struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
+	struct net_device *real_dev = vlan->real_dev;
+
+	return dev_hard_header(skb, real_dev, type, daddr, saddr, len);
+}
+
+static const struct header_ops vlan_passthru_header_ops = {
+	.create	 = vlan_passthru_hard_header,
+	.rebuild = dev_rebuild_header,
+	.parse	 = eth_header_parse,
+};
+
 static const struct net_device_ops vlan_netdev_ops;
 
 static int vlan_dev_init(struct net_device *dev)
@@ -564,7 +581,7 @@ static int vlan_dev_init(struct net_devi
 
 	dev->needed_headroom = real_dev->needed_headroom;
 	if (real_dev->features & NETIF_F_HW_VLAN_TX) {
-		dev->header_ops      = real_dev->header_ops;
+		dev->header_ops      = &vlan_passthru_header_ops;
 		dev->hard_header_len = real_dev->hard_header_len;
 	} else {
 		dev->header_ops      = &vlan_header_ops;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/bridge/br_multicast.c linux-libre-3.4.77-gnu1/net/bridge/br_multicast.c
--- linux-libre-3.4.76-gnu1/net/bridge/br_multicast.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/bridge/br_multicast.c	2014-01-15 18:27:19.000000000 -0500
@@ -1744,7 +1744,7 @@ int br_multicast_set_hash_max(struct net
 	u32 old;
 	struct net_bridge_mdb_htable *mdb;
 
-	spin_lock(&br->multicast_lock);
+	spin_lock_bh(&br->multicast_lock);
 	if (!netif_running(br->dev))
 		goto unlock;
 
@@ -1776,7 +1776,7 @@ rollback:
 	}
 
 unlock:
-	spin_unlock(&br->multicast_lock);
+	spin_unlock_bh(&br->multicast_lock);
 
 	return err;
 }
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/core/drop_monitor.c linux-libre-3.4.77-gnu1/net/core/drop_monitor.c
--- linux-libre-3.4.76-gnu1/net/core/drop_monitor.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/core/drop_monitor.c	2014-01-15 18:27:19.000000000 -0500
@@ -61,7 +61,6 @@ static struct genl_family net_drop_monit
 	.hdrsize        = 0,
 	.name           = "NET_DM",
 	.version        = 2,
-	.maxattr        = NET_DM_CMD_MAX,
 };
 
 static DEFINE_PER_CPU(struct per_cpu_dm_data, dm_cpu_data);
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/core/sock.c linux-libre-3.4.77-gnu1/net/core/sock.c
--- linux-libre-3.4.76-gnu1/net/core/sock.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/core/sock.c	2014-01-15 18:27:19.000000000 -0500
@@ -795,7 +795,7 @@ set_rcvbuf:
 
 	case SO_PEEK_OFF:
 		if (sock->ops->set_peek_off)
-			sock->ops->set_peek_off(sk, val);
+			ret = sock->ops->set_peek_off(sk, val);
 		else
 			ret = -EOPNOTSUPP;
 		break;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/ipv4/inet_diag.c linux-libre-3.4.77-gnu1/net/ipv4/inet_diag.c
--- linux-libre-3.4.76-gnu1/net/ipv4/inet_diag.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/ipv4/inet_diag.c	2014-01-15 18:27:19.000000000 -0500
@@ -110,6 +110,10 @@ int inet_sk_diag_fill(struct sock *sk, s
 
 	r->id.idiag_sport = inet->inet_sport;
 	r->id.idiag_dport = inet->inet_dport;
+
+	memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+	memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
+
 	r->id.idiag_src[0] = inet->inet_rcv_saddr;
 	r->id.idiag_dst[0] = inet->inet_daddr;
 
@@ -227,12 +231,19 @@ static int inet_twsk_diag_fill(struct in
 
 	r->idiag_family	      = tw->tw_family;
 	r->idiag_retrans      = 0;
+
 	r->id.idiag_if	      = tw->tw_bound_dev_if;
 	sock_diag_save_cookie(tw, r->id.idiag_cookie);
+
 	r->id.idiag_sport     = tw->tw_sport;
 	r->id.idiag_dport     = tw->tw_dport;
+
+	memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+	memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
+
 	r->id.idiag_src[0]    = tw->tw_rcv_saddr;
 	r->id.idiag_dst[0]    = tw->tw_daddr;
+
 	r->idiag_state	      = tw->tw_substate;
 	r->idiag_timer	      = 3;
 	r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
@@ -714,8 +725,13 @@ static int inet_diag_fill_req(struct sk_
 
 	r->id.idiag_sport = inet->inet_sport;
 	r->id.idiag_dport = ireq->rmt_port;
+
+	memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src));
+	memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst));
+
 	r->id.idiag_src[0] = ireq->loc_addr;
 	r->id.idiag_dst[0] = ireq->rmt_addr;
+
 	r->idiag_expires = jiffies_to_msecs(tmo);
 	r->idiag_rqueue = 0;
 	r->idiag_wqueue = 0;
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/ipv6/route.c linux-libre-3.4.77-gnu1/net/ipv6/route.c
--- linux-libre-3.4.76-gnu1/net/ipv6/route.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/ipv6/route.c	2014-01-15 18:27:19.000000000 -0500
@@ -2114,15 +2114,11 @@ struct rt6_info *addrconf_dst_alloc(stru
 {
 	struct net *net = dev_net(idev->dev);
 	struct rt6_info *rt = ip6_dst_alloc(&net->ipv6.ip6_dst_ops,
-					    net->loopback_dev, 0);
+					    net->loopback_dev, DST_NOCOUNT);
 	int err;
 
-	if (!rt) {
-		if (net_ratelimit())
-			pr_warning("IPv6:  Maximum number of routes reached,"
-				   " consider increasing route/max_size.\n");
+	if (!rt)
 		return ERR_PTR(-ENOMEM);
-	}
 
 	in6_dev_hold(idev);
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/llc/af_llc.c linux-libre-3.4.77-gnu1/net/llc/af_llc.c
--- linux-libre-3.4.76-gnu1/net/llc/af_llc.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/llc/af_llc.c	2014-01-15 18:27:19.000000000 -0500
@@ -716,7 +716,7 @@ static int llc_ui_recvmsg(struct kiocb *
 	unsigned long cpu_flags;
 	size_t copied = 0;
 	u32 peek_seq = 0;
-	u32 *seq;
+	u32 *seq, skb_len;
 	unsigned long used;
 	int target;	/* Read at least this many bytes */
 	long timeo;
@@ -814,6 +814,7 @@ static int llc_ui_recvmsg(struct kiocb *
 		}
 		continue;
 	found_ok_skb:
+		skb_len = skb->len;
 		/* Ok so how much can we use? */
 		used = skb->len - offset;
 		if (len < used)
@@ -846,7 +847,7 @@ static int llc_ui_recvmsg(struct kiocb *
 		}
 
 		/* Partial read */
-		if (used + offset < skb->len)
+		if (used + offset < skb_len)
 			continue;
 	} while (len > 0);
 
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/rds/ib.c linux-libre-3.4.77-gnu1/net/rds/ib.c
--- linux-libre-3.4.76-gnu1/net/rds/ib.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/rds/ib.c	2014-01-15 18:27:19.000000000 -0500
@@ -338,7 +338,8 @@ static int rds_ib_laddr_check(__be32 add
 	ret = rdma_bind_addr(cm_id, (struct sockaddr *)&sin);
 	/* due to this, we will claim to support iWARP devices unless we
 	   check node_type. */
-	if (ret || cm_id->device->node_type != RDMA_NODE_IB_CA)
+	if (ret || !cm_id->device ||
+	    cm_id->device->node_type != RDMA_NODE_IB_CA)
 		ret = -EADDRNOTAVAIL;
 
 	rdsdebug("addr %pI4 ret %d node type %d\n",
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/rds/ib_send.c linux-libre-3.4.77-gnu1/net/rds/ib_send.c
--- linux-libre-3.4.76-gnu1/net/rds/ib_send.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/rds/ib_send.c	2014-01-15 18:27:19.000000000 -0500
@@ -552,9 +552,8 @@ int rds_ib_xmit(struct rds_connection *c
 	    && rm->m_inc.i_hdr.h_flags & RDS_FLAG_CONG_BITMAP) {
 		rds_cong_map_updated(conn->c_fcong, ~(u64) 0);
 		scat = &rm->data.op_sg[sg];
-		ret = sizeof(struct rds_header) + RDS_CONG_MAP_BYTES;
-		ret = min_t(int, ret, scat->length - conn->c_xmit_data_off);
-		return ret;
+		ret = max_t(int, RDS_CONG_MAP_BYTES, scat->length);
+		return sizeof(struct rds_header) + ret;
 	}
 
 	/* FIXME we may overallocate here */
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/rose/af_rose.c linux-libre-3.4.77-gnu1/net/rose/af_rose.c
--- linux-libre-3.4.76-gnu1/net/rose/af_rose.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/rose/af_rose.c	2014-01-15 18:27:19.000000000 -0500
@@ -1257,6 +1257,7 @@ static int rose_recvmsg(struct kiocb *io
 
 	if (msg->msg_name) {
 		struct sockaddr_rose *srose;
+		struct full_sockaddr_rose *full_srose = msg->msg_name;
 
 		memset(msg->msg_name, 0, sizeof(struct full_sockaddr_rose));
 		srose = msg->msg_name;
@@ -1264,18 +1265,9 @@ static int rose_recvmsg(struct kiocb *io
 		srose->srose_addr   = rose->dest_addr;
 		srose->srose_call   = rose->dest_call;
 		srose->srose_ndigis = rose->dest_ndigis;
-		if (msg->msg_namelen >= sizeof(struct full_sockaddr_rose)) {
-			struct full_sockaddr_rose *full_srose = (struct full_sockaddr_rose *)msg->msg_name;
-			for (n = 0 ; n < rose->dest_ndigis ; n++)
-				full_srose->srose_digis[n] = rose->dest_digis[n];
-			msg->msg_namelen = sizeof(struct full_sockaddr_rose);
-		} else {
-			if (rose->dest_ndigis >= 1) {
-				srose->srose_ndigis = 1;
-				srose->srose_digi = rose->dest_digis[0];
-			}
-			msg->msg_namelen = sizeof(struct sockaddr_rose);
-		}
+		for (n = 0 ; n < rose->dest_ndigis ; n++)
+			full_srose->srose_digis[n] = rose->dest_digis[n];
+		msg->msg_namelen = sizeof(struct full_sockaddr_rose);
 	}
 
 	skb_free_datagram(sk, skb);
diff -druNp --no-dereference linux-libre-3.4.76-gnu1/net/unix/af_unix.c linux-libre-3.4.77-gnu1/net/unix/af_unix.c
--- linux-libre-3.4.76-gnu1/net/unix/af_unix.c	2014-01-08 12:42:33.000000000 -0500
+++ linux-libre-3.4.77-gnu1/net/unix/af_unix.c	2014-01-15 18:27:19.000000000 -0500
@@ -524,13 +524,17 @@ static int unix_seqpacket_sendmsg(struct
 static int unix_seqpacket_recvmsg(struct kiocb *, struct socket *,
 				  struct msghdr *, size_t, int);
 
-static void unix_set_peek_off(struct sock *sk, int val)
+static int unix_set_peek_off(struct sock *sk, int val)
 {
 	struct unix_sock *u = unix_sk(sk);
 
-	mutex_lock(&u->readlock);
+	if (mutex_lock_interruptible(&u->readlock))
+		return -EINTR;
+
 	sk->sk_peek_off = val;
 	mutex_unlock(&u->readlock);
+
+	return 0;
 }
 
 
@@ -708,7 +712,9 @@ static int unix_autobind(struct socket *
 	int err;
 	unsigned int retries = 0;
 
-	mutex_lock(&u->readlock);
+	err = mutex_lock_interruptible(&u->readlock);
+	if (err)
+		return err;
 
 	err = 0;
 	if (u->addr)
@@ -841,7 +847,9 @@ static int unix_bind(struct socket *sock
 		goto out;
 	addr_len = err;
 
-	mutex_lock(&u->readlock);
+	err = mutex_lock_interruptible(&u->readlock);
+	if (err)
+		goto out;
 
 	err = -EINVAL;
 	if (u->addr)
