diff -druNp --no-dereference linux-libre-3.18.60-gnu/arch/mips/include/uapi/asm/swab.h linux-libre-3.18.61-gnu/arch/mips/include/uapi/asm/swab.h
--- linux-libre-3.18.60-gnu/arch/mips/include/uapi/asm/swab.h	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/arch/mips/include/uapi/asm/swab.h	2017-07-15 04:24:32.000000000 -0400
@@ -13,8 +13,9 @@
 
 #define __SWAB_64_THRU_32__
 
-#if (defined(__mips_isa_rev) && (__mips_isa_rev >= 2)) ||		\
-    defined(_MIPS_ARCH_LOONGSON3A)
+#if !defined(__mips16) &&					\
+	((defined(__mips_isa_rev) && (__mips_isa_rev >= 2)) ||	\
+	 defined(_MIPS_ARCH_LOONGSON3A))
 
 static inline __attribute_const__ __u16 __arch_swab16(__u16 x)
 {
@@ -65,5 +66,5 @@ static inline __attribute_const__ __u64
 }
 #define __arch_swab64 __arch_swab64
 #endif /* __mips64 */
-#endif /* MIPS R2 or newer or Loongson 3A */
+#endif /* (not __mips16) and (MIPS R2 or newer or Loongson 3A) */
 #endif /* _ASM_SWAB_H */
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/base/platform.c linux-libre-3.18.61-gnu/drivers/base/platform.c
--- linux-libre-3.18.60-gnu/drivers/base/platform.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/base/platform.c	2017-07-15 04:24:32.000000000 -0400
@@ -727,7 +727,7 @@ static ssize_t driver_override_store(str
 				     const char *buf, size_t count)
 {
 	struct platform_device *pdev = to_platform_device(dev);
-	char *driver_override, *old = pdev->driver_override, *cp;
+	char *driver_override, *old, *cp;
 
 	if (count > PATH_MAX)
 		return -EINVAL;
@@ -740,12 +740,15 @@ static ssize_t driver_override_store(str
 	if (cp)
 		*cp = '\0';
 
+	device_lock(dev);
+	old = pdev->driver_override;
 	if (strlen(driver_override)) {
 		pdev->driver_override = driver_override;
 	} else {
 		kfree(driver_override);
 		pdev->driver_override = NULL;
 	}
+	device_unlock(dev);
 
 	kfree(old);
 
@@ -756,8 +759,12 @@ static ssize_t driver_override_show(stru
 				    struct device_attribute *attr, char *buf)
 {
 	struct platform_device *pdev = to_platform_device(dev);
+	ssize_t len;
 
-	return sprintf(buf, "%s\n", pdev->driver_override);
+	device_lock(dev);
+	len = sprintf(buf, "%s\n", pdev->driver_override);
+	device_unlock(dev);
+	return len;
 }
 static DEVICE_ATTR_RW(driver_override);
 
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/md/md.c linux-libre-3.18.61-gnu/drivers/md/md.c
--- linux-libre-3.18.60-gnu/drivers/md/md.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/md/md.c	2017-07-15 04:24:32.000000000 -0400
@@ -1829,7 +1829,7 @@ super_1_rdev_size_change(struct md_rdev
 	}
 	sb = page_address(rdev->sb_page);
 	sb->data_size = cpu_to_le64(num_sectors);
-	sb->super_offset = rdev->sb_start;
+	sb->super_offset = cpu_to_le64(rdev->sb_start);
 	sb->sb_csum = calc_sb_1_csum(sb);
 	md_super_write(rdev->mddev, rdev, rdev->sb_start, rdev->sb_size,
 		       rdev->sb_page);
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/media/pci/saa7134/saa7134-i2c.c linux-libre-3.18.61-gnu/drivers/media/pci/saa7134/saa7134-i2c.c
--- linux-libre-3.18.60-gnu/drivers/media/pci/saa7134/saa7134-i2c.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/media/pci/saa7134/saa7134-i2c.c	2017-07-15 04:24:32.000000000 -0400
@@ -350,12 +350,43 @@ static struct i2c_client saa7134_client_
 
 /* ----------------------------------------------------------- */
 
+/* On Medion 7134 reading EEPROM needs DVB-T demod i2c gate open */
+static void saa7134_i2c_eeprom_md7134_gate(struct saa7134_dev *dev)
+{
+	u8 subaddr = 0x7, dmdregval;
+	u8 data[2];
+	int ret;
+	struct i2c_msg i2cgatemsg_r[] = { {.addr = 0x08, .flags = 0,
+					   .buf = &subaddr, .len = 1},
+					  {.addr = 0x08,
+					   .flags = I2C_M_RD,
+					   .buf = &dmdregval, .len = 1}
+					};
+	struct i2c_msg i2cgatemsg_w[] = { {.addr = 0x08, .flags = 0,
+					   .buf = data, .len = 2} };
+
+	ret = i2c_transfer(&dev->i2c_adap, i2cgatemsg_r, 2);
+	if ((ret == 2) && (dmdregval & 0x2)) {
+		pr_debug("%s: DVB-T demod i2c gate was left closed\n",
+			 dev->name);
+
+		data[0] = subaddr;
+		data[1] = (dmdregval & ~0x2);
+		if (i2c_transfer(&dev->i2c_adap, i2cgatemsg_w, 1) != 1)
+			pr_err("%s: EEPROM i2c gate open failure\n",
+			  dev->name);
+	}
+}
+
 static int
 saa7134_i2c_eeprom(struct saa7134_dev *dev, unsigned char *eedata, int len)
 {
 	unsigned char buf;
 	int i,err;
 
+	if (dev->board == SAA7134_BOARD_MD7134)
+		saa7134_i2c_eeprom_md7134_gate(dev);
+
 	dev->i2c_client.addr = 0xa0 >> 1;
 	buf = 0;
 	if (1 != (err = i2c_master_send(&dev->i2c_client,&buf,1))) {
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/net/ethernet/broadcom/bgmac.c linux-libre-3.18.61-gnu/drivers/net/ethernet/broadcom/bgmac.c
--- linux-libre-3.18.60-gnu/drivers/net/ethernet/broadcom/bgmac.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/net/ethernet/broadcom/bgmac.c	2017-07-15 04:24:32.000000000 -0400
@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct
 /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */
 static int bgmac_probe(struct bcma_device *core)
 {
+	struct bcma_chipinfo *ci = &core->bus->chipinfo;
 	struct net_device *net_dev;
 	struct bgmac *bgmac;
 	struct ssb_sprom *sprom = &core->bus->sprom;
@@ -1430,6 +1431,11 @@ static int bgmac_probe(struct bcma_devic
 		dev_warn(&core->dev, "Using random MAC: %pM\n", mac);
 	}
 
+	/* This (reset &) enable is not preset in specs or reference driver but
+	 * Broadcom does it in arch PCI code when enabling fake PCI device.
+	 */
+	bcma_core_enable(core, 0);
+
 	/* Allocation and references */
 	net_dev = alloc_etherdev(sizeof(*bgmac));
 	if (!net_dev)
@@ -1474,8 +1480,8 @@ static int bgmac_probe(struct bcma_devic
 	bgmac_chip_reset(bgmac);
 
 	/* For Northstar, we have to take all GMAC core out of reset */
-	if (core->id.id == BCMA_CHIP_ID_BCM4707 ||
-	    core->id.id == BCMA_CHIP_ID_BCM53018) {
+	if (ci->id == BCMA_CHIP_ID_BCM4707 ||
+	    ci->id == BCMA_CHIP_ID_BCM53018) {
 		struct bcma_device *ns_core;
 		int ns_gmac;
 
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/pinctrl/freescale/pinctrl-mxs.c linux-libre-3.18.61-gnu/drivers/pinctrl/freescale/pinctrl-mxs.c
--- linux-libre-3.18.60-gnu/drivers/pinctrl/freescale/pinctrl-mxs.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/pinctrl/freescale/pinctrl-mxs.c	2017-07-15 04:24:32.000000000 -0400
@@ -195,6 +195,16 @@ static int mxs_pinctrl_get_func_groups(s
 	return 0;
 }
 
+static void mxs_pinctrl_rmwl(u32 value, u32 mask, u8 shift, void __iomem *reg)
+{
+	u32 tmp;
+
+	tmp = readl(reg);
+	tmp &= ~(mask << shift);
+	tmp |= value << shift;
+	writel(tmp, reg);
+}
+
 static int mxs_pinctrl_set_mux(struct pinctrl_dev *pctldev, unsigned selector,
 			       unsigned group)
 {
@@ -212,8 +222,7 @@ static int mxs_pinctrl_set_mux(struct pi
 		reg += bank * 0x20 + pin / 16 * 0x10;
 		shift = pin % 16 * 2;
 
-		writel(0x3 << shift, reg + CLR);
-		writel(g->muxsel[i] << shift, reg + SET);
+		mxs_pinctrl_rmwl(g->muxsel[i], 0x3, shift, reg);
 	}
 
 	return 0;
@@ -280,8 +289,7 @@ static int mxs_pinconf_group_set(struct
 			/* mA */
 			if (config & MA_PRESENT) {
 				shift = pin % 8 * 4;
-				writel(0x3 << shift, reg + CLR);
-				writel(ma << shift, reg + SET);
+				mxs_pinctrl_rmwl(ma, 0x3, shift, reg);
 			}
 
 			/* vol */
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/pinctrl/sh-pfc/core.c linux-libre-3.18.61-gnu/drivers/pinctrl/sh-pfc/core.c
--- linux-libre-3.18.60-gnu/drivers/pinctrl/sh-pfc/core.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/pinctrl/sh-pfc/core.c	2017-07-15 04:24:32.000000000 -0400
@@ -529,6 +529,9 @@ static int sh_pfc_probe(struct platform_
 		ret = info->ops->init(pfc);
 		if (ret < 0)
 			return ret;
+
+		/* .init() may have overridden pfc->info */
+		info = pfc->info;
 	}
 
 	pinctrl_provide_dummies();
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/staging/comedi/comedi_fops.c linux-libre-3.18.61-gnu/drivers/staging/comedi/comedi_fops.c
--- linux-libre-3.18.60-gnu/drivers/staging/comedi/comedi_fops.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/staging/comedi/comedi_fops.c	2017-07-15 04:24:32.000000000 -0400
@@ -2600,6 +2600,7 @@ static int __init comedi_init(void)
 		dev = comedi_alloc_board_minor(NULL);
 		if (IS_ERR(dev)) {
 			comedi_cleanup_board_minors();
+			class_destroy(comedi_class);
 			cdev_del(&comedi_cdev);
 			unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
 						 COMEDI_NUM_MINORS);
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/staging/vt6656/main_usb.c linux-libre-3.18.61-gnu/drivers/staging/vt6656/main_usb.c
--- linux-libre-3.18.60-gnu/drivers/staging/vt6656/main_usb.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/staging/vt6656/main_usb.c	2017-07-15 04:24:32.000000000 -0400
@@ -539,6 +539,9 @@ static int vnt_start(struct ieee80211_hw
 		goto free_all;
 	}
 
+	if (vnt_key_init_table(priv))
+		goto free_all;
+
 	priv->int_interval = 1;  /* bInterval is set to 1 */
 
 	vnt_int_start_interrupt(priv);
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/core/quirks.c linux-libre-3.18.61-gnu/drivers/usb/core/quirks.c
--- linux-libre-3.18.60-gnu/drivers/usb/core/quirks.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/core/quirks.c	2017-07-15 04:24:32.000000000 -0400
@@ -216,6 +216,10 @@ static const struct usb_device_id usb_qu
 	/* Blackmagic Design UltraStudio SDI */
 	{ USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
 
+	/* Hauppauge HVR-950q */
+	{ USB_DEVICE(0x2040, 0x7200), .driver_info =
+			USB_QUIRK_CONFIG_INTF_STRINGS },
+
 	/* INTEL VALUE SSD */
 	{ USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME },
 
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/dwc3/dwc3-st.c linux-libre-3.18.61-gnu/drivers/usb/dwc3/dwc3-st.c
--- linux-libre-3.18.60-gnu/drivers/usb/dwc3/dwc3-st.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/dwc3/dwc3-st.c	2017-07-15 04:24:32.000000000 -0400
@@ -227,7 +227,7 @@ static int st_dwc3_probe(struct platform
 
 	dwc3_data->syscfg_reg_off = res->start;
 
-	dev_vdbg(&pdev->dev, "glue-logic addr 0x%p, syscfg-reg offset 0x%x\n",
+	dev_vdbg(&pdev->dev, "glue-logic addr 0x%pK, syscfg-reg offset 0x%x\n",
 		 dwc3_data->glue_base, dwc3_data->syscfg_reg_off);
 
 	dwc3_data->rstc_pwrdn = devm_reset_control_get(dev, "powerdown");
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/dwc3/gadget.c linux-libre-3.18.61-gnu/drivers/usb/dwc3/gadget.c
--- linux-libre-3.18.60-gnu/drivers/usb/dwc3/gadget.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/dwc3/gadget.c	2017-07-15 04:24:32.000000000 -0400
@@ -1229,7 +1229,7 @@ static int dwc3_gadget_ep_dequeue(struct
 			dwc3_stop_active_transfer(dwc, dep->number, true);
 			goto out1;
 		}
-		dev_err(dwc->dev, "request %p was not queued to %s\n",
+		dev_err(dwc->dev, "request %pK was not queued to %s\n",
 				request, ep->name);
 		ret = -EINVAL;
 		goto out0;
@@ -1833,7 +1833,7 @@ static int __dwc3_cleanup_done_trbs(stru
 		 * would help. Lets hope that if this occurs, someone
 		 * fixes the root cause instead of looking away :)
 		 */
-		dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n",
+		dev_err(dwc->dev, "%s's TRB (%pK) still owned by HW\n",
 				dep->name, trb);
 
 	count = trb->size & DWC3_TRB_SIZE_MASK;
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/host/ehci-orion.c linux-libre-3.18.61-gnu/drivers/usb/host/ehci-orion.c
--- linux-libre-3.18.60-gnu/drivers/usb/host/ehci-orion.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/host/ehci-orion.c	2017-07-15 04:24:32.000000000 -0400
@@ -226,7 +226,8 @@ static int ehci_orion_drv_probe(struct p
 	priv->phy = devm_phy_optional_get(&pdev->dev, "usb");
 	if (IS_ERR(priv->phy)) {
 		err = PTR_ERR(priv->phy);
-		goto err_phy_get;
+		if (err != -ENOSYS)
+			goto err_phy_get;
 	} else {
 		err = phy_init(priv->phy);
 		if (err)
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/serial/cp210x.c linux-libre-3.18.61-gnu/drivers/usb/serial/cp210x.c
--- linux-libre-3.18.60-gnu/drivers/usb/serial/cp210x.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/serial/cp210x.c	2017-07-15 04:24:32.000000000 -0400
@@ -132,6 +132,7 @@ static const struct usb_device_id id_tab
 	{ USB_DEVICE(0x10C4, 0x8977) },	/* CEL MeshWorks DevKit Device */
 	{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */
 	{ USB_DEVICE(0x10C4, 0x8A2A) }, /* HubZ dual ZigBee and Z-Wave dongle */
+	{ USB_DEVICE(0x10C4, 0x8A5E) }, /* CEL EM3588 ZigBee USB Stick Long Range */
 	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
 	{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/serial/option.c linux-libre-3.18.61-gnu/drivers/usb/serial/option.c
--- linux-libre-3.18.60-gnu/drivers/usb/serial/option.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/serial/option.c	2017-07-15 04:24:32.000000000 -0400
@@ -1872,6 +1872,10 @@ static const struct usb_device_id option
   	  .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
   	},
 	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
+	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),
+	  .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+	{ USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),
+	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
 	{ USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
 	{ USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/serial/qcserial.c linux-libre-3.18.61-gnu/drivers/usb/serial/qcserial.c
--- linux-libre-3.18.60-gnu/drivers/usb/serial/qcserial.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/serial/qcserial.c	2017-07-15 04:24:32.000000000 -0400
@@ -152,6 +152,7 @@ static const struct usb_device_id id_tab
 	{DEVICE_SWI(0x1199, 0x9056)},	/* Sierra Wireless Modem */
 	{DEVICE_SWI(0x1199, 0x9060)},	/* Sierra Wireless Modem */
 	{DEVICE_SWI(0x1199, 0x9061)},	/* Sierra Wireless Modem */
+	{DEVICE_SWI(0x1199, 0x9063)},	/* Sierra Wireless EM7305 */
 	{DEVICE_SWI(0x1199, 0x9070)},	/* Sierra Wireless MC74xx */
 	{DEVICE_SWI(0x1199, 0x9071)},	/* Sierra Wireless MC74xx */
 	{DEVICE_SWI(0x1199, 0x9078)},	/* Sierra Wireless EM74xx */
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/usbip/stub_main.c linux-libre-3.18.61-gnu/drivers/usb/usbip/stub_main.c
--- linux-libre-3.18.60-gnu/drivers/usb/usbip/stub_main.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/usbip/stub_main.c	2017-07-15 04:24:32.000000000 -0400
@@ -262,7 +262,11 @@ void stub_device_cleanup_urbs(struct stu
 		kmem_cache_free(stub_priv_cache, priv);
 
 		kfree(urb->transfer_buffer);
+		urb->transfer_buffer = NULL;
+
 		kfree(urb->setup_packet);
+		urb->setup_packet = NULL;
+
 		usb_free_urb(urb);
 	}
 }
diff -druNp --no-dereference linux-libre-3.18.60-gnu/drivers/usb/usbip/stub_tx.c linux-libre-3.18.61-gnu/drivers/usb/usbip/stub_tx.c
--- linux-libre-3.18.60-gnu/drivers/usb/usbip/stub_tx.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/drivers/usb/usbip/stub_tx.c	2017-07-15 04:24:32.000000000 -0400
@@ -28,7 +28,11 @@ static void stub_free_priv_and_urb(struc
 	struct urb *urb = priv->urb;
 
 	kfree(urb->setup_packet);
+	urb->setup_packet = NULL;
+
 	kfree(urb->transfer_buffer);
+	urb->transfer_buffer = NULL;
+
 	list_del(&priv->list);
 	kmem_cache_free(stub_priv_cache, priv);
 	usb_free_urb(urb);
diff -druNp --no-dereference linux-libre-3.18.60-gnu/include/linux/usb/hcd.h linux-libre-3.18.61-gnu/include/linux/usb/hcd.h
--- linux-libre-3.18.60-gnu/include/linux/usb/hcd.h	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/include/linux/usb/hcd.h	2017-07-15 04:24:32.000000000 -0400
@@ -545,9 +545,9 @@ extern void usb_ep0_reinit(struct usb_de
 	((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_INTERFACE)<<8)
 
 #define EndpointRequest \
-	((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_INTERFACE)<<8)
+	((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
 #define EndpointOutRequest \
-	((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_INTERFACE)<<8)
+	((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
 
 /* class requests from the USB 2.0 hub spec, table 11-15 */
 /* GetBusState and SetHubDescriptor are optional, omitted */
diff -druNp --no-dereference linux-libre-3.18.60-gnu/ipc/mqueue.c linux-libre-3.18.61-gnu/ipc/mqueue.c
--- linux-libre-3.18.60-gnu/ipc/mqueue.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/ipc/mqueue.c	2017-07-15 04:24:32.000000000 -0400
@@ -1239,8 +1239,10 @@ retry:
 
 			timeo = MAX_SCHEDULE_TIMEOUT;
 			ret = netlink_attachskb(sock, nc, &timeo, NULL);
-			if (ret == 1)
+			if (ret == 1) {
+				sock = NULL;
 				goto retry;
+			}
 			if (ret) {
 				sock = NULL;
 				nc = NULL;
diff -druNp --no-dereference linux-libre-3.18.60-gnu/kernel/trace/trace_kprobe.c linux-libre-3.18.61-gnu/kernel/trace/trace_kprobe.c
--- linux-libre-3.18.60-gnu/kernel/trace/trace_kprobe.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/kernel/trace/trace_kprobe.c	2017-07-15 04:24:32.000000000 -0400
@@ -671,30 +671,25 @@ static int create_trace_kprobe(int argc,
 		pr_info("Probe point is not specified.\n");
 		return -EINVAL;
 	}
-	if (isdigit(argv[1][0])) {
-		if (is_return) {
-			pr_info("Return probe point must be a symbol.\n");
-			return -EINVAL;
-		}
-		/* an address specified */
-		ret = kstrtoul(&argv[1][0], 0, (unsigned long *)&addr);
-		if (ret) {
-			pr_info("Failed to parse address.\n");
-			return ret;
-		}
-	} else {
+
+	/* try to parse an address. if that fails, try to read the
+	 * input as a symbol. */
+	if (kstrtoul(argv[1], 0, (unsigned long *)&addr)) {
 		/* a symbol specified */
 		symbol = argv[1];
 		/* TODO: support .init module functions */
 		ret = traceprobe_split_symbol_offset(symbol, &offset);
 		if (ret) {
-			pr_info("Failed to parse symbol.\n");
+			pr_info("Failed to parse either an address or a symbol.\n");
 			return ret;
 		}
 		if (offset && is_return) {
 			pr_info("Return probe must be used without offset.\n");
 			return -EINVAL;
 		}
+	} else if (is_return) {
+		pr_info("Return probe point must be a symbol.\n");
+		return -EINVAL;
 	}
 	argc -= 2; argv += 2;
 
diff -druNp --no-dereference linux-libre-3.18.60-gnu/Makefile linux-libre-3.18.61-gnu/Makefile
--- linux-libre-3.18.60-gnu/Makefile	2017-07-05 12:41:08.000000000 -0400
+++ linux-libre-3.18.61-gnu/Makefile	2017-07-15 13:17:34.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 3
 PATCHLEVEL = 18
-SUBLEVEL = 60
+SUBLEVEL = 61
 EXTRAVERSION =-gnu
 NAME = Diseased Newt
 
diff -druNp --no-dereference linux-libre-3.18.60-gnu/security/keys/encrypted-keys/encrypted.c linux-libre-3.18.61-gnu/security/keys/encrypted-keys/encrypted.c
--- linux-libre-3.18.60-gnu/security/keys/encrypted-keys/encrypted.c	2017-07-05 08:35:29.000000000 -0400
+++ linux-libre-3.18.61-gnu/security/keys/encrypted-keys/encrypted.c	2017-07-15 04:24:32.000000000 -0400
@@ -428,7 +428,7 @@ static int init_blkcipher_desc(struct bl
 static struct key *request_master_key(struct encrypted_key_payload *epayload,
 				      u8 **master_key, size_t *master_keylen)
 {
-	struct key *mkey = NULL;
+	struct key *mkey = ERR_PTR(-EINVAL);
 
 	if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,
 		     KEY_TRUSTED_PREFIX_LEN)) {
