diff -druNp --no-dereference linux-libre-3.14.69-gnu/arch/arm/mach-omap2/sleep34xx.S linux-libre-3.14.70-gnu/arch/arm/mach-omap2/sleep34xx.S
--- linux-libre-3.14.69-gnu/arch/arm/mach-omap2/sleep34xx.S	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/arch/arm/mach-omap2/sleep34xx.S	2016-05-18 20:04:11.000000000 -0400
@@ -203,23 +203,8 @@ save_context_wfi:
 	 */
 	ldr	r1, kernel_flush
 	blx	r1
-	/*
-	 * The kernel doesn't interwork: v7_flush_dcache_all in particluar will
-	 * always return in Thumb state when CONFIG_THUMB2_KERNEL is enabled.
-	 * This sequence switches back to ARM.  Note that .align may insert a
-	 * nop: bx pc needs to be word-aligned in order to work.
-	 */
- THUMB(	.thumb		)
- THUMB(	.align		)
- THUMB(	bx	pc	)
- THUMB(	nop		)
-	.arm
-
 	b	omap3_do_wfi
-
-/*
- * Local variables
- */
+ENDPROC(omap34xx_cpu_suspend)
 omap3_do_wfi_sram_addr:
 	.word omap3_do_wfi_sram
 kernel_flush:
@@ -364,10 +349,7 @@ exit_nonoff_modes:
  * ===================================
  */
 	ldmfd	sp!, {r4 - r11, pc}	@ restore regs and return
-
-/*
- * Local variables
- */
+ENDPROC(omap3_do_wfi)
 sdrc_power:
 	.word	SDRC_POWER_V
 cm_idlest1_core:
diff -druNp --no-dereference linux-libre-3.14.69-gnu/crypto/ahash.c linux-libre-3.14.70-gnu/crypto/ahash.c
--- linux-libre-3.14.69-gnu/crypto/ahash.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/crypto/ahash.c	2016-05-18 20:04:11.000000000 -0400
@@ -64,8 +64,9 @@ static int hash_walk_new_entry(struct cr
 	struct scatterlist *sg;
 
 	sg = walk->sg;
-	walk->pg = sg_page(sg);
 	walk->offset = sg->offset;
+	walk->pg = sg_page(walk->sg) + (walk->offset >> PAGE_SHIFT);
+	walk->offset = offset_in_page(walk->offset);
 	walk->entrylen = sg->length;
 
 	if (walk->entrylen > walk->total)
diff -druNp --no-dereference linux-libre-3.14.69-gnu/drivers/gpu/drm/i915/intel_crt.c linux-libre-3.14.70-gnu/drivers/gpu/drm/i915/intel_crt.c
--- linux-libre-3.14.69-gnu/drivers/gpu/drm/i915/intel_crt.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/drivers/gpu/drm/i915/intel_crt.c	2016-05-18 20:04:11.000000000 -0400
@@ -259,8 +259,14 @@ static bool intel_crt_compute_config(str
 		pipe_config->has_pch_encoder = true;
 
 	/* LPT FDI RX only supports 8bpc. */
-	if (HAS_PCH_LPT(dev))
+	if (HAS_PCH_LPT(dev)) {
+		if (pipe_config->bw_constrained && pipe_config->pipe_bpp < 24) {
+			DRM_DEBUG_KMS("LPT only supports 24bpp\n");
+			return false;
+		}
+
 		pipe_config->pipe_bpp = 24;
+	}
 
 	return true;
 }
diff -druNp --no-dereference linux-libre-3.14.69-gnu/drivers/gpu/drm/radeon/atombios_crtc.c linux-libre-3.14.70-gnu/drivers/gpu/drm/radeon/atombios_crtc.c
--- linux-libre-3.14.69-gnu/drivers/gpu/drm/radeon/atombios_crtc.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/drivers/gpu/drm/radeon/atombios_crtc.c	2016-05-18 20:04:11.000000000 -0400
@@ -1600,6 +1600,7 @@ static u32 radeon_get_pll_use_mask(struc
 static int radeon_get_shared_dp_ppll(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
+	struct radeon_device *rdev = dev->dev_private;
 	struct drm_crtc *test_crtc;
 	struct radeon_crtc *test_radeon_crtc;
 
@@ -1609,6 +1610,10 @@ static int radeon_get_shared_dp_ppll(str
 		test_radeon_crtc = to_radeon_crtc(test_crtc);
 		if (test_radeon_crtc->encoder &&
 		    ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_radeon_crtc->encoder))) {
+			/* PPLL2 is exclusive to UNIPHYA on DCE61 */
+			if (ASIC_IS_DCE61(rdev) && !ASIC_IS_DCE8(rdev) &&
+			    test_radeon_crtc->pll_id == ATOM_PPLL2)
+				continue;
 			/* for DP use the same PLL for all */
 			if (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID)
 				return test_radeon_crtc->pll_id;
@@ -1630,6 +1635,7 @@ static int radeon_get_shared_nondp_ppll(
 {
 	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);
 	struct drm_device *dev = crtc->dev;
+	struct radeon_device *rdev = dev->dev_private;
 	struct drm_crtc *test_crtc;
 	struct radeon_crtc *test_radeon_crtc;
 	u32 adjusted_clock, test_adjusted_clock;
@@ -1645,6 +1651,10 @@ static int radeon_get_shared_nondp_ppll(
 		test_radeon_crtc = to_radeon_crtc(test_crtc);
 		if (test_radeon_crtc->encoder &&
 		    !ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_radeon_crtc->encoder))) {
+			/* PPLL2 is exclusive to UNIPHYA on DCE61 */
+			if (ASIC_IS_DCE61(rdev) && !ASIC_IS_DCE8(rdev) &&
+			    test_radeon_crtc->pll_id == ATOM_PPLL2)
+				continue;
 			/* check if we are already driving this connector with another crtc */
 			if (test_radeon_crtc->connector == radeon_crtc->connector) {
 				/* if we are, return that pll */
diff -druNp --no-dereference linux-libre-3.14.69-gnu/drivers/input/misc/max8997_haptic.c linux-libre-3.14.70-gnu/drivers/input/misc/max8997_haptic.c
--- linux-libre-3.14.69-gnu/drivers/input/misc/max8997_haptic.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/drivers/input/misc/max8997_haptic.c	2016-05-18 20:04:11.000000000 -0400
@@ -245,12 +245,14 @@ static int max8997_haptic_probe(struct p
 	struct max8997_dev *iodev = dev_get_drvdata(pdev->dev.parent);
 	const struct max8997_platform_data *pdata =
 					dev_get_platdata(iodev->dev);
-	const struct max8997_haptic_platform_data *haptic_pdata =
-					pdata->haptic_pdata;
+	const struct max8997_haptic_platform_data *haptic_pdata = NULL;
 	struct max8997_haptic *chip;
 	struct input_dev *input_dev;
 	int error;
 
+	if (pdata)
+		haptic_pdata = pdata->haptic_pdata;
+
 	if (!haptic_pdata) {
 		dev_err(&pdev->dev, "no haptic platform data\n");
 		return -EINVAL;
diff -druNp --no-dereference linux-libre-3.14.69-gnu/drivers/net/ethernet/atheros/atlx/atl2.c linux-libre-3.14.70-gnu/drivers/net/ethernet/atheros/atlx/atl2.c
--- linux-libre-3.14.69-gnu/drivers/net/ethernet/atheros/atlx/atl2.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/drivers/net/ethernet/atheros/atlx/atl2.c	2016-05-18 20:04:11.000000000 -0400
@@ -1413,7 +1413,7 @@ static int atl2_probe(struct pci_dev *pd
 
 	err = -EIO;
 
-	netdev->hw_features = NETIF_F_SG | NETIF_F_HW_VLAN_CTAG_RX;
+	netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;
 	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);
 
 	/* Init PHY as early as possible due to power saving issue  */
diff -druNp --no-dereference linux-libre-3.14.69-gnu/drivers/pnp/pnpbios/bioscalls.c linux-libre-3.14.70-gnu/drivers/pnp/pnpbios/bioscalls.c
--- linux-libre-3.14.69-gnu/drivers/pnp/pnpbios/bioscalls.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/drivers/pnp/pnpbios/bioscalls.c	2016-05-18 20:04:11.000000000 -0400
@@ -21,7 +21,7 @@
 
 #include "pnpbios.h"
 
-static struct {
+__visible struct {
 	u16 offset;
 	u16 segment;
 } pnp_bios_callpoint;
@@ -41,6 +41,7 @@ asmlinkage void pnp_bios_callfunc(void);
 
 __asm__(".text			\n"
 	__ALIGN_STR "\n"
+	".globl pnp_bios_callfunc\n"
 	"pnp_bios_callfunc:\n"
 	"	pushl %edx	\n"
 	"	pushl %ecx	\n"
@@ -66,9 +67,9 @@ static struct desc_struct bad_bios_desc
  * after PnP BIOS oopses.
  */
 
-u32 pnp_bios_fault_esp;
-u32 pnp_bios_fault_eip;
-u32 pnp_bios_is_utter_crap = 0;
+__visible u32 pnp_bios_fault_esp;
+__visible u32 pnp_bios_fault_eip;
+__visible u32 pnp_bios_is_utter_crap = 0;
 
 static spinlock_t pnp_bios_lock;
 
diff -druNp --no-dereference linux-libre-3.14.69-gnu/fs/isofs/rock.c linux-libre-3.14.70-gnu/fs/isofs/rock.c
--- linux-libre-3.14.69-gnu/fs/isofs/rock.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/fs/isofs/rock.c	2016-05-18 20:04:11.000000000 -0400
@@ -203,6 +203,8 @@ int get_rock_ridge_filename(struct iso_d
 	int retnamlen = 0;
 	int truncate = 0;
 	int ret = 0;
+	char *p;
+	int len;
 
 	if (!ISOFS_SB(inode->i_sb)->s_rock)
 		return 0;
@@ -267,12 +269,17 @@ repeat:
 					rr->u.NM.flags);
 				break;
 			}
-			if ((strlen(retname) + rr->len - 5) >= 254) {
+			len = rr->len - 5;
+			if (retnamlen + len >= 254) {
 				truncate = 1;
 				break;
 			}
-			strncat(retname, rr->u.NM.name, rr->len - 5);
-			retnamlen += rr->len - 5;
+			p = memchr(rr->u.NM.name, '\0', len);
+			if (unlikely(p))
+				len = p - rr->u.NM.name;
+			memcpy(retname + retnamlen, rr->u.NM.name, len);
+			retnamlen += len;
+			retname[retnamlen] = '\0';
 			break;
 		case SIG('R', 'E'):
 			kfree(rs.buffer);
diff -druNp --no-dereference linux-libre-3.14.69-gnu/Makefile linux-libre-3.14.70-gnu/Makefile
--- linux-libre-3.14.69-gnu/Makefile	2016-05-12 05:52:52.000000000 -0400
+++ linux-libre-3.14.70-gnu/Makefile	2016-05-19 14:04:56.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 14
-SUBLEVEL = 69
+SUBLEVEL = 70
 EXTRAVERSION =-gnu
 NAME = Remembering Coco
 
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/bridge/br_ioctl.c linux-libre-3.14.70-gnu/net/bridge/br_ioctl.c
--- linux-libre-3.14.69-gnu/net/bridge/br_ioctl.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/bridge/br_ioctl.c	2016-05-18 20:04:11.000000000 -0400
@@ -21,18 +21,19 @@
 #include <asm/uaccess.h>
 #include "br_private.h"
 
-/* called with RTNL */
 static int get_bridge_ifindices(struct net *net, int *indices, int num)
 {
 	struct net_device *dev;
 	int i = 0;
 
-	for_each_netdev(net, dev) {
+	rcu_read_lock();
+	for_each_netdev_rcu(net, dev) {
 		if (i >= num)
 			break;
 		if (dev->priv_flags & IFF_EBRIDGE)
 			indices[i++] = dev->ifindex;
 	}
+	rcu_read_unlock();
 
 	return i;
 }
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/core/rtnetlink.c linux-libre-3.14.70-gnu/net/core/rtnetlink.c
--- linux-libre-3.14.69-gnu/net/core/rtnetlink.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/core/rtnetlink.c	2016-05-18 20:04:11.000000000 -0400
@@ -1010,14 +1010,16 @@ static int rtnl_fill_ifinfo(struct sk_bu
 		goto nla_put_failure;
 
 	if (1) {
-		struct rtnl_link_ifmap map = {
-			.mem_start   = dev->mem_start,
-			.mem_end     = dev->mem_end,
-			.base_addr   = dev->base_addr,
-			.irq         = dev->irq,
-			.dma         = dev->dma,
-			.port        = dev->if_port,
-		};
+		struct rtnl_link_ifmap map;
+
+		memset(&map, 0, sizeof(map));
+		map.mem_start   = dev->mem_start;
+		map.mem_end     = dev->mem_end;
+		map.base_addr   = dev->base_addr;
+		map.irq         = dev->irq;
+		map.dma         = dev->dma;
+		map.port        = dev->if_port;
+
 		if (nla_put(skb, IFLA_MAP, sizeof(map), &map))
 			goto nla_put_failure;
 	}
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/decnet/dn_route.c linux-libre-3.14.70-gnu/net/decnet/dn_route.c
--- linux-libre-3.14.69-gnu/net/decnet/dn_route.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/decnet/dn_route.c	2016-05-18 20:04:11.000000000 -0400
@@ -1030,10 +1030,13 @@ source_ok:
 	if (!fld.daddr) {
 		fld.daddr = fld.saddr;
 
-		err = -EADDRNOTAVAIL;
 		if (dev_out)
 			dev_put(dev_out);
+		err = -EINVAL;
 		dev_out = init_net.loopback_dev;
+		if (!dev_out->dn_ptr)
+			goto out;
+		err = -EADDRNOTAVAIL;
 		dev_hold(dev_out);
 		if (!fld.daddr) {
 			fld.daddr =
@@ -1106,6 +1109,8 @@ source_ok:
 		if (dev_out == NULL)
 			goto out;
 		dn_db = rcu_dereference_raw(dev_out->dn_ptr);
+		if (!dn_db)
+			goto e_inval;
 		/* Possible improvement - check all devices for local addr */
 		if (dn_dev_islocal(dev_out, fld.daddr)) {
 			dev_put(dev_out);
@@ -1147,6 +1152,8 @@ select_source:
 			dev_put(dev_out);
 		dev_out = init_net.loopback_dev;
 		dev_hold(dev_out);
+		if (!dev_out->dn_ptr)
+			goto e_inval;
 		fld.flowidn_oif = dev_out->ifindex;
 		if (res.fi)
 			dn_fib_info_put(res.fi);
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/ipv4/route.c linux-libre-3.14.70-gnu/net/ipv4/route.c
--- linux-libre-3.14.69-gnu/net/ipv4/route.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/ipv4/route.c	2016-05-18 20:04:11.000000000 -0400
@@ -1926,6 +1926,18 @@ static struct rtable *__mkroute_output(c
 		 */
 		if (fi && res->prefixlen < 4)
 			fi = NULL;
+	} else if ((type == RTN_LOCAL) && (orig_oif != 0) &&
+		   (orig_oif != dev_out->ifindex)) {
+		/* For local routes that require a particular output interface
+		 * we do not want to cache the result.  Caching the result
+		 * causes incorrect behaviour when there are multiple source
+		 * addresses on the interface, the end result being that if the
+		 * intended recipient is waiting on that interface for the
+		 * packet he won't receive it because it will be delivered on
+		 * the loopback interface and the IP_PKTINFO ipi_ifindex will
+		 * be set to the loopback interface as well.
+		 */
+		fi = NULL;
 	}
 
 	fnhe = NULL;
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/llc/af_llc.c linux-libre-3.14.70-gnu/net/llc/af_llc.c
--- linux-libre-3.14.69-gnu/net/llc/af_llc.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/llc/af_llc.c	2016-05-18 20:04:11.000000000 -0400
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *
 	if (llc->cmsg_flags & LLC_CMSG_PKTINFO) {
 		struct llc_pktinfo info;
 
+		memset(&info, 0, sizeof(info));
 		info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex;
 		llc_pdu_decode_dsap(skb, &info.lpi_sap);
 		llc_pdu_decode_da(skb, info.lpi_mac);
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/packet/af_packet.c linux-libre-3.14.70-gnu/net/packet/af_packet.c
--- linux-libre-3.14.69-gnu/net/packet/af_packet.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/packet/af_packet.c	2016-05-18 20:04:11.000000000 -0400
@@ -3153,6 +3153,7 @@ static int packet_mc_add(struct sock *sk
 	i->ifindex = mreq->mr_ifindex;
 	i->alen = mreq->mr_alen;
 	memcpy(i->addr, mreq->mr_address, i->alen);
+	memset(i->addr + i->alen, 0, sizeof(i->addr) - i->alen);
 	i->count = 1;
 	i->next = po->mclist;
 	po->mclist = i;
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/vmw_vsock/af_vsock.c linux-libre-3.14.70-gnu/net/vmw_vsock/af_vsock.c
--- linux-libre-3.14.69-gnu/net/vmw_vsock/af_vsock.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/vmw_vsock/af_vsock.c	2016-05-18 20:04:11.000000000 -0400
@@ -1796,27 +1796,8 @@ vsock_stream_recvmsg(struct kiocb *kiocb
 	else if (sk->sk_shutdown & RCV_SHUTDOWN)
 		err = 0;
 
-	if (copied > 0) {
-		/* We only do these additional bookkeeping/notification steps
-		 * if we actually copied something out of the queue pair
-		 * instead of just peeking ahead.
-		 */
-
-		if (!(flags & MSG_PEEK)) {
-			/* If the other side has shutdown for sending and there
-			 * is nothing more to read, then modify the socket
-			 * state.
-			 */
-			if (vsk->peer_shutdown & SEND_SHUTDOWN) {
-				if (vsock_stream_has_data(vsk) <= 0) {
-					sk->sk_state = SS_UNCONNECTED;
-					sock_set_flag(sk, SOCK_DONE);
-					sk->sk_state_change(sk);
-				}
-			}
-		}
+	if (copied > 0)
 		err = copied;
-	}
 
 out_wait:
 	finish_wait(sk_sleep(sk), &wait);
diff -druNp --no-dereference linux-libre-3.14.69-gnu/net/x25/x25_facilities.c linux-libre-3.14.70-gnu/net/x25/x25_facilities.c
--- linux-libre-3.14.69-gnu/net/x25/x25_facilities.c	2016-05-11 05:23:00.000000000 -0400
+++ linux-libre-3.14.70-gnu/net/x25/x25_facilities.c	2016-05-18 20:04:11.000000000 -0400
@@ -277,6 +277,7 @@ int x25_negotiate_facilities(struct sk_b
 
 	memset(&theirs, 0, sizeof(theirs));
 	memcpy(new, ours, sizeof(*new));
+	memset(dte, 0, sizeof(*dte));
 
 	len = x25_parse_facilities(skb, &theirs, dte, &x25->vc_facil_mask);
 	if (len < 0)
