diff -druNp --no-dereference linux-libre-4.9.112-gnu/arch/mips/kernel/process.c linux-libre-4.9.113-gnu/arch/mips/kernel/process.c
--- linux-libre-4.9.112-gnu/arch/mips/kernel/process.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/arch/mips/kernel/process.c	2018-07-17 05:37:54.000000000 -0400
@@ -641,8 +641,8 @@ static void arch_dump_stack(void *info)
 
 	if (regs)
 		show_regs(regs);
-
-	dump_stack();
+	else
+		dump_stack();
 }
 
 void arch_trigger_cpumask_backtrace(const cpumask_t *mask, bool exclude_self)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/arch/mips/kernel/traps.c linux-libre-4.9.113-gnu/arch/mips/kernel/traps.c
--- linux-libre-4.9.112-gnu/arch/mips/kernel/traps.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/arch/mips/kernel/traps.c	2018-07-17 05:37:54.000000000 -0400
@@ -351,6 +351,7 @@ static void __show_regs(const struct pt_
 void show_regs(struct pt_regs *regs)
 {
 	__show_regs((struct pt_regs *)regs);
+	dump_stack();
 }
 
 void show_registers(struct pt_regs *regs)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/arch/mips/mm/ioremap.c linux-libre-4.9.113-gnu/arch/mips/mm/ioremap.c
--- linux-libre-4.9.112-gnu/arch/mips/mm/ioremap.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/arch/mips/mm/ioremap.c	2018-07-17 05:37:54.000000000 -0400
@@ -9,6 +9,7 @@
 #include <linux/export.h>
 #include <asm/addrspace.h>
 #include <asm/byteorder.h>
+#include <linux/ioport.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
@@ -97,6 +98,20 @@ static int remap_area_pages(unsigned lon
 	return error;
 }
 
+static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
+			       void *arg)
+{
+	unsigned long i;
+
+	for (i = 0; i < nr_pages; i++) {
+		if (pfn_valid(start_pfn + i) &&
+		    !PageReserved(pfn_to_page(start_pfn + i)))
+			return 1;
+	}
+
+	return 0;
+}
+
 /*
  * Generic mapping function (not visible outside):
  */
@@ -115,8 +130,8 @@ static int remap_area_pages(unsigned lon
 
 void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)
 {
+	unsigned long offset, pfn, last_pfn;
 	struct vm_struct * area;
-	unsigned long offset;
 	phys_addr_t last_addr;
 	void * addr;
 
@@ -136,18 +151,16 @@ void __iomem * __ioremap(phys_addr_t phy
 		return (void __iomem *) CKSEG1ADDR(phys_addr);
 
 	/*
-	 * Don't allow anybody to remap normal RAM that we're using..
+	 * Don't allow anybody to remap RAM that may be allocated by the page
+	 * allocator, since that could lead to races & data clobbering.
 	 */
-	if (phys_addr < virt_to_phys(high_memory)) {
-		char *t_addr, *t_end;
-		struct page *page;
-
-		t_addr = __va(phys_addr);
-		t_end = t_addr + (size - 1);
-
-		for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)
-			if(!PageReserved(page))
-				return NULL;
+	pfn = PFN_DOWN(phys_addr);
+	last_pfn = PFN_DOWN(last_addr);
+	if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
+				  __ioremap_check_ram) == 1) {
+		WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n",
+			  &phys_addr, &last_addr);
+		return NULL;
 	}
 
 	/*
diff -druNp --no-dereference linux-libre-4.9.112-gnu/arch/x86/kernel/uprobes.c linux-libre-4.9.113-gnu/arch/x86/kernel/uprobes.c
--- linux-libre-4.9.112-gnu/arch/x86/kernel/uprobes.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/arch/x86/kernel/uprobes.c	2018-07-17 05:37:54.000000000 -0400
@@ -290,7 +290,7 @@ static int uprobe_init_insn(struct arch_
 	insn_init(insn, auprobe->insn, sizeof(auprobe->insn), x86_64);
 	/* has the side-effect of processing the entire instruction */
 	insn_get_length(insn);
-	if (WARN_ON_ONCE(!insn_complete(insn)))
+	if (!insn_complete(insn))
 		return -ENOEXEC;
 
 	if (is_prefix_bad(insn))
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/ata/ahci.c linux-libre-4.9.113-gnu/drivers/ata/ahci.c
--- linux-libre-4.9.112-gnu/drivers/ata/ahci.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/ata/ahci.c	2018-07-17 05:37:54.000000000 -0400
@@ -1260,6 +1260,59 @@ static bool ahci_broken_suspend(struct p
 	return strcmp(buf, dmi->driver_data) < 0;
 }
 
+static bool ahci_broken_lpm(struct pci_dev *pdev)
+{
+	static const struct dmi_system_id sysids[] = {
+		/* Various Lenovo 50 series have LPM issues with older BIOSen */
+		{
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X250"),
+			},
+			.driver_data = "20180406", /* 1.31 */
+		},
+		{
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L450"),
+			},
+			.driver_data = "20180420", /* 1.28 */
+		},
+		{
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T450s"),
+			},
+			.driver_data = "20180315", /* 1.33 */
+		},
+		{
+			.matches = {
+				DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+				DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W541"),
+			},
+			/*
+			 * Note date based on release notes, 2.35 has been
+			 * reported to be good, but I've been unable to get
+			 * a hold of the reporter to get the DMI BIOS date.
+			 * TODO: fix this.
+			 */
+			.driver_data = "20180310", /* 2.35 */
+		},
+		{ }	/* terminate list */
+	};
+	const struct dmi_system_id *dmi = dmi_first_match(sysids);
+	int year, month, date;
+	char buf[9];
+
+	if (!dmi)
+		return false;
+
+	dmi_get_date(DMI_BIOS_DATE, &year, &month, &date);
+	snprintf(buf, sizeof(buf), "%04d%02d%02d", year, month, date);
+
+	return strcmp(buf, dmi->driver_data) < 0;
+}
+
 static bool ahci_broken_online(struct pci_dev *pdev)
 {
 #define ENCODE_BUSDEVFN(bus, slot, func)			\
@@ -1626,6 +1679,12 @@ static int ahci_init_one(struct pci_dev
 			"quirky BIOS, skipping spindown on poweroff\n");
 	}
 
+	if (ahci_broken_lpm(pdev)) {
+		pi.flags |= ATA_FLAG_NO_LPM;
+		dev_warn(&pdev->dev,
+			 "BIOS update required for Link Power Management support\n");
+	}
+
 	if (ahci_broken_suspend(pdev)) {
 		hpriv->flags |= AHCI_HFLAG_NO_SUSPEND;
 		dev_warn(&pdev->dev,
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/ata/libata-core.c linux-libre-4.9.113-gnu/drivers/ata/libata-core.c
--- linux-libre-4.9.112-gnu/drivers/ata/libata-core.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/ata/libata-core.c	2018-07-17 05:37:54.000000000 -0400
@@ -2385,6 +2385,9 @@ int ata_dev_configure(struct ata_device
 	    (id[ATA_ID_SATA_CAPABILITY] & 0xe) == 0x2)
 		dev->horkage |= ATA_HORKAGE_NOLPM;
 
+	if (ap->flags & ATA_FLAG_NO_LPM)
+		dev->horkage |= ATA_HORKAGE_NOLPM;
+
 	if (dev->horkage & ATA_HORKAGE_NOLPM) {
 		ata_dev_warn(dev, "LPM support broken, forcing max_power\n");
 		dev->link->ap->target_lpm_policy = ATA_LPM_MAX_POWER;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/ata/libata-scsi.c linux-libre-4.9.113-gnu/drivers/ata/libata-scsi.c
--- linux-libre-4.9.112-gnu/drivers/ata/libata-scsi.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/ata/libata-scsi.c	2018-07-17 05:37:54.000000000 -0400
@@ -3772,10 +3772,20 @@ static unsigned int ata_scsi_zbc_out_xla
 		 */
 		goto invalid_param_len;
 	}
-	if (block > dev->n_sectors)
-		goto out_of_range;
 
 	all = cdb[14] & 0x1;
+	if (all) {
+		/*
+		 * Ignore the block address (zone ID) as defined by ZBC.
+		 */
+		block = 0;
+	} else if (block >= dev->n_sectors) {
+		/*
+		 * Block must be a valid zone ID (a zone start LBA).
+		 */
+		fp = 2;
+		goto invalid_fld;
+	}
 
 	if (ata_ncq_enabled(qc->dev) &&
 	    ata_fpdma_zac_mgmt_out_supported(qc->dev)) {
@@ -3804,10 +3814,6 @@ static unsigned int ata_scsi_zbc_out_xla
  invalid_fld:
 	ata_scsi_set_invalid_field(qc->dev, scmd, fp, 0xff);
 	return 1;
- out_of_range:
-	/* "Logical Block Address out of range" */
-	ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x21, 0x00);
-	return 1;
 invalid_param_len:
 	/* "Parameter list length error" */
 	ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x1a, 0x0);
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/block/loop.c linux-libre-4.9.113-gnu/drivers/block/loop.c
--- linux-libre-4.9.112-gnu/drivers/block/loop.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/block/loop.c	2018-07-17 05:37:54.000000000 -0400
@@ -640,6 +640,36 @@ static void loop_reread_partitions(struc
 			__func__, lo->lo_number, lo->lo_file_name, rc);
 }
 
+static inline int is_loop_device(struct file *file)
+{
+	struct inode *i = file->f_mapping->host;
+
+	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
+}
+
+static int loop_validate_file(struct file *file, struct block_device *bdev)
+{
+	struct inode	*inode = file->f_mapping->host;
+	struct file	*f = file;
+
+	/* Avoid recursion */
+	while (is_loop_device(f)) {
+		struct loop_device *l;
+
+		if (f->f_mapping->host->i_bdev == bdev)
+			return -EBADF;
+
+		l = f->f_mapping->host->i_bdev->bd_disk->private_data;
+		if (l->lo_state == Lo_unbound) {
+			return -EINVAL;
+		}
+		f = l->lo_backing_file;
+	}
+	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))
+		return -EINVAL;
+	return 0;
+}
+
 /*
  * loop_change_fd switched the backing store of a loopback device to
  * a new file. This is useful for operating system installers to free up
@@ -669,14 +699,15 @@ static int loop_change_fd(struct loop_de
 	if (!file)
 		goto out;
 
+	error = loop_validate_file(file, bdev);
+	if (error)
+		goto out_putf;
+
 	inode = file->f_mapping->host;
 	old_file = lo->lo_backing_file;
 
 	error = -EINVAL;
 
-	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))
-		goto out_putf;
-
 	/* size of the new backing store needs to be the same */
 	if (get_loop_size(lo, file) != get_loop_size(lo, old_file))
 		goto out_putf;
@@ -697,13 +728,6 @@ static int loop_change_fd(struct loop_de
 	return error;
 }
 
-static inline int is_loop_device(struct file *file)
-{
-	struct inode *i = file->f_mapping->host;
-
-	return i && S_ISBLK(i->i_mode) && MAJOR(i->i_rdev) == LOOP_MAJOR;
-}
-
 /* loop sysfs attributes */
 
 static ssize_t loop_attr_show(struct device *dev, char *page,
@@ -800,16 +824,17 @@ static struct attribute_group loop_attri
 	.attrs= loop_attrs,
 };
 
-static int loop_sysfs_init(struct loop_device *lo)
+static void loop_sysfs_init(struct loop_device *lo)
 {
-	return sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj,
-				  &loop_attribute_group);
+	lo->sysfs_inited = !sysfs_create_group(&disk_to_dev(lo->lo_disk)->kobj,
+						&loop_attribute_group);
 }
 
 static void loop_sysfs_exit(struct loop_device *lo)
 {
-	sysfs_remove_group(&disk_to_dev(lo->lo_disk)->kobj,
-			   &loop_attribute_group);
+	if (lo->sysfs_inited)
+		sysfs_remove_group(&disk_to_dev(lo->lo_disk)->kobj,
+				   &loop_attribute_group);
 }
 
 static void loop_config_discard(struct loop_device *lo)
@@ -861,7 +886,7 @@ static int loop_prepare_queue(struct loo
 static int loop_set_fd(struct loop_device *lo, fmode_t mode,
 		       struct block_device *bdev, unsigned int arg)
 {
-	struct file	*file, *f;
+	struct file	*file;
 	struct inode	*inode;
 	struct address_space *mapping;
 	unsigned lo_blocksize;
@@ -881,29 +906,13 @@ static int loop_set_fd(struct loop_devic
 	if (lo->lo_state != Lo_unbound)
 		goto out_putf;
 
-	/* Avoid recursion */
-	f = file;
-	while (is_loop_device(f)) {
-		struct loop_device *l;
-
-		if (f->f_mapping->host->i_bdev == bdev)
-			goto out_putf;
-
-		l = f->f_mapping->host->i_bdev->bd_disk->private_data;
-		if (l->lo_state == Lo_unbound) {
-			error = -EINVAL;
-			goto out_putf;
-		}
-		f = l->lo_backing_file;
-	}
+	error = loop_validate_file(file, bdev);
+	if (error)
+		goto out_putf;
 
 	mapping = file->f_mapping;
 	inode = mapping->host;
 
-	error = -EINVAL;
-	if (!S_ISREG(inode->i_mode) && !S_ISBLK(inode->i_mode))
-		goto out_putf;
-
 	if (!(file->f_mode & FMODE_WRITE) || !(mode & FMODE_WRITE) ||
 	    !file->f_op->write_iter)
 		lo_flags |= LO_FLAGS_READ_ONLY;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/block/loop.h linux-libre-4.9.113-gnu/drivers/block/loop.h
--- linux-libre-4.9.112-gnu/drivers/block/loop.h	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/block/loop.h	2018-07-17 05:37:54.000000000 -0400
@@ -59,6 +59,7 @@ struct loop_device {
 	struct kthread_worker	worker;
 	struct task_struct	*worker_task;
 	bool			use_dio;
+	bool			sysfs_inited;
 
 	struct request_queue	*lo_queue;
 	struct blk_mq_tag_set	tag_set;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/hid/hid-ids.h linux-libre-4.9.113-gnu/drivers/hid/hid-ids.h
--- linux-libre-4.9.112-gnu/drivers/hid/hid-ids.h	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/hid/hid-ids.h	2018-07-17 05:37:54.000000000 -0400
@@ -549,6 +549,9 @@
 #define USB_VENDOR_ID_IRTOUCHSYSTEMS	0x6615
 #define USB_DEVICE_ID_IRTOUCH_INFRARED_USB	0x0070
 
+#define USB_VENDOR_ID_INNOMEDIA			0x1292
+#define USB_DEVICE_ID_INNEX_GENESIS_ATARI	0x4745
+
 #define USB_VENDOR_ID_ITE               0x048d
 #define USB_DEVICE_ID_ITE_LENOVO_YOGA   0x8386
 #define USB_DEVICE_ID_ITE_LENOVO_YOGA2  0x8350
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/hid/usbhid/hid-quirks.c linux-libre-4.9.113-gnu/drivers/hid/usbhid/hid-quirks.c
--- linux-libre-4.9.112-gnu/drivers/hid/usbhid/hid-quirks.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/hid/usbhid/hid-quirks.c	2018-07-17 05:37:54.000000000 -0400
@@ -170,6 +170,7 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_2NES2SNES, HID_QUIRK_MULTI_INPUT },
 	{ USB_VENDOR_ID_DRACAL_RAPHNET, USB_DEVICE_ID_RAPHNET_4NES4SNES, HID_QUIRK_MULTI_INPUT },
+	{ USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI, HID_QUIRK_MULTI_INPUT },
 
 	{ 0, 0 }
 };
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/i2c/busses/i2c-tegra.c linux-libre-4.9.113-gnu/drivers/i2c/busses/i2c-tegra.c
--- linux-libre-4.9.112-gnu/drivers/i2c/busses/i2c-tegra.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/i2c/busses/i2c-tegra.c	2018-07-17 05:37:54.000000000 -0400
@@ -547,6 +547,14 @@ static int tegra_i2c_disable_packet_mode
 {
 	u32 cnfg;
 
+	/*
+	 * NACK interrupt is generated before the I2C controller generates
+	 * the STOP condition on the bus. So wait for 2 clock periods
+	 * before disabling the controller so that the STOP condition has
+	 * been delivered properly.
+	 */
+	udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
+
 	cnfg = i2c_readl(i2c_dev, I2C_CNFG);
 	if (cnfg & I2C_CNFG_PACKET_MODE_EN)
 		i2c_writel(i2c_dev, cnfg & ~I2C_CNFG_PACKET_MODE_EN, I2C_CNFG);
@@ -708,15 +716,6 @@ static int tegra_i2c_xfer_msg(struct teg
 	if (likely(i2c_dev->msg_err == I2C_ERR_NONE))
 		return 0;
 
-	/*
-	 * NACK interrupt is generated before the I2C controller generates
-	 * the STOP condition on the bus. So wait for 2 clock periods
-	 * before resetting the controller so that the STOP condition has
-	 * been delivered properly.
-	 */
-	if (i2c_dev->msg_err == I2C_ERR_NO_ACK)
-		udelay(DIV_ROUND_UP(2 * 1000000, i2c_dev->bus_clk_rate));
-
 	tegra_i2c_init(i2c_dev);
 	if (i2c_dev->msg_err == I2C_ERR_NO_ACK) {
 		if (msg->flags & I2C_M_IGNORE_NAK)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/infiniband/core/Makefile linux-libre-4.9.113-gnu/drivers/infiniband/core/Makefile
--- linux-libre-4.9.112-gnu/drivers/infiniband/core/Makefile	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/infiniband/core/Makefile	2018-07-17 05:37:54.000000000 -0400
@@ -4,8 +4,8 @@ user_access-$(CONFIG_INFINIBAND_ADDR_TRA
 obj-$(CONFIG_INFINIBAND) +=		ib_core.o ib_cm.o iw_cm.o \
 					$(infiniband-y)
 obj-$(CONFIG_INFINIBAND_USER_MAD) +=	ib_umad.o
-obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o \
-					$(user_access-y)
+obj-$(CONFIG_INFINIBAND_USER_ACCESS) += ib_uverbs.o $(user_access-y)
+obj-$(CONFIG_INFINIBAND_USER_ACCESS_UCM) += ib_ucm.o $(user_access-y)
 
 ib_core-y :=			packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \
 				device.o fmr_pool.o cache.o netlink.o \
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/infiniband/hw/cxgb4/mem.c linux-libre-4.9.113-gnu/drivers/infiniband/hw/cxgb4/mem.c
--- linux-libre-4.9.112-gnu/drivers/infiniband/hw/cxgb4/mem.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/infiniband/hw/cxgb4/mem.c	2018-07-17 05:37:54.000000000 -0400
@@ -724,7 +724,7 @@ static int c4iw_set_page(struct ib_mr *i
 {
 	struct c4iw_mr *mhp = to_c4iw_mr(ibmr);
 
-	if (unlikely(mhp->mpl_len == mhp->max_mpl_len))
+	if (unlikely(mhp->mpl_len == mhp->attr.pbl_size))
 		return -ENOMEM;
 
 	mhp->mpl[mhp->mpl_len++] = addr;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/infiniband/Kconfig linux-libre-4.9.113-gnu/drivers/infiniband/Kconfig
--- linux-libre-4.9.112-gnu/drivers/infiniband/Kconfig	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/infiniband/Kconfig	2018-07-17 05:37:54.000000000 -0400
@@ -34,6 +34,18 @@ config INFINIBAND_USER_ACCESS
 	  libibverbs, libibcm and a hardware driver library from
 	  <http://www.openfabrics.org/git/>.
 
+config INFINIBAND_USER_ACCESS_UCM
+	bool "Userspace CM (UCM, DEPRECATED)"
+	depends on BROKEN
+	depends on INFINIBAND_USER_ACCESS
+	help
+	  The UCM module has known security flaws, which no one is
+	  interested to fix. The user-space part of this code was
+	  dropped from the upstream a long time ago.
+
+	  This option is DEPRECATED and planned to be removed.
+
+
 config INFINIBAND_USER_MEM
 	bool
 	depends on INFINIBAND_USER_ACCESS != n
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/misc/ibmasm/ibmasmfs.c linux-libre-4.9.113-gnu/drivers/misc/ibmasm/ibmasmfs.c
--- linux-libre-4.9.112-gnu/drivers/misc/ibmasm/ibmasmfs.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/misc/ibmasm/ibmasmfs.c	2018-07-17 05:37:54.000000000 -0400
@@ -507,35 +507,14 @@ static int remote_settings_file_close(st
 static ssize_t remote_settings_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
 	void __iomem *address = (void __iomem *)file->private_data;
-	unsigned char *page;
-	int retval;
 	int len = 0;
 	unsigned int value;
-
-	if (*offset < 0)
-		return -EINVAL;
-	if (count == 0 || count > 1024)
-		return 0;
-	if (*offset != 0)
-		return 0;
-
-	page = (unsigned char *)__get_free_page(GFP_KERNEL);
-	if (!page)
-		return -ENOMEM;
+	char lbuf[20];
 
 	value = readl(address);
-	len = sprintf(page, "%d\n", value);
-
-	if (copy_to_user(buf, page, len)) {
-		retval = -EFAULT;
-		goto exit;
-	}
-	*offset += len;
-	retval = len;
+	len = snprintf(lbuf, sizeof(lbuf), "%d\n", value);
 
-exit:
-	free_page((unsigned long)page);
-	return retval;
+	return simple_read_from_buffer(buf, count, offset, lbuf, len);
 }
 
 static ssize_t remote_settings_file_write(struct file *file, const char __user *ubuff, size_t count, loff_t *offset)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/misc/vmw_balloon.c linux-libre-4.9.113-gnu/drivers/misc/vmw_balloon.c
--- linux-libre-4.9.112-gnu/drivers/misc/vmw_balloon.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/misc/vmw_balloon.c	2018-07-17 05:37:54.000000000 -0400
@@ -467,7 +467,7 @@ static int vmballoon_send_batched_lock(s
 		unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
 	unsigned long status;
-	unsigned long pfn = page_to_pfn(b->page);
+	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
 	STATS_INC(b->stats.lock[is_2m_pages]);
 
@@ -515,7 +515,7 @@ static bool vmballoon_send_batched_unloc
 		unsigned int num_pages, bool is_2m_pages, unsigned int *target)
 {
 	unsigned long status;
-	unsigned long pfn = page_to_pfn(b->page);
+	unsigned long pfn = PHYS_PFN(virt_to_phys(b->batch_page));
 
 	STATS_INC(b->stats.unlock[is_2m_pages]);
 
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/mmc/host/dw_mmc.c linux-libre-4.9.113-gnu/drivers/mmc/host/dw_mmc.c
--- linux-libre-4.9.112-gnu/drivers/mmc/host/dw_mmc.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/mmc/host/dw_mmc.c	2018-07-17 05:37:54.000000000 -0400
@@ -981,8 +981,8 @@ static void dw_mci_ctrl_thld(struct dw_m
 	 * It's used when HS400 mode is enabled.
 	 */
 	if (data->flags & MMC_DATA_WRITE &&
-		!(host->timing != MMC_TIMING_MMC_HS400))
-		return;
+		host->timing != MMC_TIMING_MMC_HS400)
+		goto disable;
 
 	if (data->flags & MMC_DATA_WRITE)
 		enable = SDMMC_CARD_WR_THR_EN;
@@ -990,7 +990,8 @@ static void dw_mci_ctrl_thld(struct dw_m
 		enable = SDMMC_CARD_RD_THR_EN;
 
 	if (host->timing != MMC_TIMING_MMC_HS200 &&
-	    host->timing != MMC_TIMING_UHS_SDR104)
+	    host->timing != MMC_TIMING_UHS_SDR104 &&
+	    host->timing != MMC_TIMING_MMC_HS400)
 		goto disable;
 
 	blksz_depth = blksz / (1 << host->data_shift);
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/nvme/host/core.c linux-libre-4.9.113-gnu/drivers/nvme/host/core.c
--- linux-libre-4.9.112-gnu/drivers/nvme/host/core.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/nvme/host/core.c	2018-07-17 05:37:54.000000000 -0400
@@ -2042,7 +2042,8 @@ void nvme_kill_queues(struct nvme_ctrl *
 	mutex_lock(&ctrl->namespaces_mutex);
 
 	/* Forcibly start all queues to avoid having stuck requests */
-	blk_mq_start_hw_queues(ctrl->admin_q);
+	if (ctrl->admin_q)
+		blk_mq_start_hw_queues(ctrl->admin_q);
 
 	list_for_each_entry(ns, &ctrl->namespaces, list) {
 		/*
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/nvme/host/pci.c linux-libre-4.9.113-gnu/drivers/nvme/host/pci.c
--- linux-libre-4.9.112-gnu/drivers/nvme/host/pci.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/nvme/host/pci.c	2018-07-17 05:37:54.000000000 -0400
@@ -1034,17 +1034,15 @@ static int nvme_cmb_qdepth(struct nvme_d
 static int nvme_alloc_sq_cmds(struct nvme_dev *dev, struct nvme_queue *nvmeq,
 				int qid, int depth)
 {
-	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz)) {
-		unsigned offset = (qid - 1) * roundup(SQ_SIZE(depth),
-						      dev->ctrl.page_size);
-		nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset;
-		nvmeq->sq_cmds_io = dev->cmb + offset;
-	} else {
-		nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth),
-					&nvmeq->sq_dma_addr, GFP_KERNEL);
-		if (!nvmeq->sq_cmds)
-			return -ENOMEM;
-	}
+
+	/* CMB SQEs will be mapped before creation */
+	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz))
+		return 0;
+
+	nvmeq->sq_cmds = dma_alloc_coherent(dev->dev, SQ_SIZE(depth),
+					    &nvmeq->sq_dma_addr, GFP_KERNEL);
+	if (!nvmeq->sq_cmds)
+		return -ENOMEM;
 
 	return 0;
 }
@@ -1117,6 +1115,13 @@ static int nvme_create_queue(struct nvme
 	struct nvme_dev *dev = nvmeq->dev;
 	int result;
 
+	if (qid && dev->cmb && use_cmb_sqes && NVME_CMB_SQS(dev->cmbsz)) {
+		unsigned offset = (qid - 1) * roundup(SQ_SIZE(nvmeq->q_depth),
+						      dev->ctrl.page_size);
+		nvmeq->sq_dma_addr = dev->cmb_bus_addr + offset;
+		nvmeq->sq_cmds_io = dev->cmb + offset;
+	}
+
 	nvmeq->cq_vector = qid - 1;
 	result = adapter_alloc_cq(dev, qid, nvmeq);
 	if (result < 0)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/core/quirks.c linux-libre-4.9.113-gnu/drivers/usb/core/quirks.c
--- linux-libre-4.9.112-gnu/drivers/usb/core/quirks.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/core/quirks.c	2018-07-17 05:37:54.000000000 -0400
@@ -231,6 +231,10 @@ static const struct usb_device_id usb_qu
 	/* Corsair K70 RGB */
 	{ USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT },
 
+	/* Corsair Strafe */
+	{ USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT |
+	  USB_QUIRK_DELAY_CTRL_MSG },
+
 	/* Corsair Strafe RGB */
 	{ USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT |
 	  USB_QUIRK_DELAY_CTRL_MSG },
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/host/xhci-mem.c linux-libre-4.9.113-gnu/drivers/usb/host/xhci-mem.c
--- linux-libre-4.9.112-gnu/drivers/usb/host/xhci-mem.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/host/xhci-mem.c	2018-07-17 05:37:54.000000000 -0400
@@ -650,7 +650,7 @@ struct xhci_ring *xhci_stream_id_to_ring
 	if (!ep->stream_info)
 		return NULL;
 
-	if (stream_id > ep->stream_info->num_streams)
+	if (stream_id >= ep->stream_info->num_streams)
 		return NULL;
 	return ep->stream_info->stream_rings[stream_id];
 }
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/misc/yurex.c linux-libre-4.9.113-gnu/drivers/usb/misc/yurex.c
--- linux-libre-4.9.112-gnu/drivers/usb/misc/yurex.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/misc/yurex.c	2018-07-17 05:37:54.000000000 -0400
@@ -406,8 +406,7 @@ static ssize_t yurex_read(struct file *f
 			  loff_t *ppos)
 {
 	struct usb_yurex *dev;
-	int retval = 0;
-	int bytes_read = 0;
+	int len = 0;
 	char in_buffer[20];
 	unsigned long flags;
 
@@ -415,26 +414,16 @@ static ssize_t yurex_read(struct file *f
 
 	mutex_lock(&dev->io_mutex);
 	if (!dev->interface) {		/* already disconnected */
-		retval = -ENODEV;
-		goto exit;
+		mutex_unlock(&dev->io_mutex);
+		return -ENODEV;
 	}
 
 	spin_lock_irqsave(&dev->lock, flags);
-	bytes_read = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
+	len = snprintf(in_buffer, 20, "%lld\n", dev->bbu);
 	spin_unlock_irqrestore(&dev->lock, flags);
-
-	if (*ppos < bytes_read) {
-		if (copy_to_user(buffer, in_buffer + *ppos, bytes_read - *ppos))
-			retval = -EFAULT;
-		else {
-			retval = bytes_read - *ppos;
-			*ppos += bytes_read;
-		}
-	}
-
-exit:
 	mutex_unlock(&dev->io_mutex);
-	return retval;
+
+	return simple_read_from_buffer(buffer, count, ppos, in_buffer, len);
 }
 
 static ssize_t yurex_write(struct file *file, const char __user *user_buffer,
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/serial/ch341.c linux-libre-4.9.113-gnu/drivers/usb/serial/ch341.c
--- linux-libre-4.9.112-gnu/drivers/usb/serial/ch341.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/serial/ch341.c	2018-07-17 05:37:54.000000000 -0400
@@ -118,7 +118,7 @@ static int ch341_control_in(struct usb_d
 	r = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
 			    USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_DIR_IN,
 			    value, index, buf, bufsize, DEFAULT_TIMEOUT);
-	if (r < bufsize) {
+	if (r < (int)bufsize) {
 		if (r >= 0) {
 			dev_err(&dev->dev,
 				"short control message received (%d < %u)\n",
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/serial/cp210x.c linux-libre-4.9.113-gnu/drivers/usb/serial/cp210x.c
--- linux-libre-4.9.112-gnu/drivers/usb/serial/cp210x.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/serial/cp210x.c	2018-07-17 05:37:54.000000000 -0400
@@ -146,6 +146,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, 0x89A4) }, /* CESINEL FTBC Flexible Thyristor Bridge Controller */
+	{ USB_DEVICE(0x10C4, 0x89FB) }, /* Qivicon ZigBee USB Radio Stick */
 	{ 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, 0x8B34) }, /* Qivicon ZigBee USB Radio Stick */
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/serial/keyspan_pda.c linux-libre-4.9.113-gnu/drivers/usb/serial/keyspan_pda.c
--- linux-libre-4.9.112-gnu/drivers/usb/serial/keyspan_pda.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/serial/keyspan_pda.c	2018-07-17 05:37:54.000000000 -0400
@@ -373,8 +373,10 @@ static int keyspan_pda_get_modem_info(st
 			     3, /* get pins */
 			     USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
 			     0, 0, data, 1, 2000);
-	if (rc >= 0)
+	if (rc == 1)
 		*value = *data;
+	else if (rc >= 0)
+		rc = -EIO;
 
 	kfree(data);
 	return rc;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/drivers/usb/serial/mos7840.c linux-libre-4.9.113-gnu/drivers/usb/serial/mos7840.c
--- linux-libre-4.9.112-gnu/drivers/usb/serial/mos7840.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/drivers/usb/serial/mos7840.c	2018-07-17 05:37:54.000000000 -0400
@@ -482,6 +482,9 @@ static void mos7840_control_callback(str
 	}
 
 	dev_dbg(dev, "%s urb buffer size is %d\n", __func__, urb->actual_length);
+	if (urb->actual_length < 1)
+		goto out;
+
 	dev_dbg(dev, "%s mos7840_port->MsrLsr is %d port %d\n", __func__,
 		mos7840_port->MsrLsr, mos7840_port->port_num);
 	data = urb->transfer_buffer;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/fs/binfmt_elf.c linux-libre-4.9.113-gnu/fs/binfmt_elf.c
--- linux-libre-4.9.112-gnu/fs/binfmt_elf.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/fs/binfmt_elf.c	2018-07-17 05:37:54.000000000 -0400
@@ -1217,9 +1217,8 @@ static int load_elf_library(struct file
 		goto out_free_ph;
 	}
 
-	len = ELF_PAGESTART(eppnt->p_filesz + eppnt->p_vaddr +
-			    ELF_MIN_ALIGN - 1);
-	bss = eppnt->p_memsz + eppnt->p_vaddr;
+	len = ELF_PAGEALIGN(eppnt->p_filesz + eppnt->p_vaddr);
+	bss = ELF_PAGEALIGN(eppnt->p_memsz + eppnt->p_vaddr);
 	if (bss > len) {
 		error = vm_brk(len, bss - len);
 		if (error)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/fs/inode.c linux-libre-4.9.113-gnu/fs/inode.c
--- linux-libre-4.9.112-gnu/fs/inode.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/fs/inode.c	2018-07-17 05:37:54.000000000 -0400
@@ -2003,8 +2003,14 @@ void inode_init_owner(struct inode *inod
 	inode->i_uid = current_fsuid();
 	if (dir && dir->i_mode & S_ISGID) {
 		inode->i_gid = dir->i_gid;
+
+		/* Directories are special, and always inherit S_ISGID */
 		if (S_ISDIR(mode))
 			mode |= S_ISGID;
+		else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
+			 !in_group_p(inode->i_gid) &&
+			 !capable_wrt_inode_uidgid(dir, CAP_FSETID))
+			mode &= ~S_ISGID;
 	} else
 		inode->i_gid = current_fsgid();
 	inode->i_mode = mode;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/include/linux/libata.h linux-libre-4.9.113-gnu/include/linux/libata.h
--- linux-libre-4.9.112-gnu/include/linux/libata.h	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/include/linux/libata.h	2018-07-17 05:37:54.000000000 -0400
@@ -208,6 +208,7 @@ enum {
 	ATA_FLAG_SLAVE_POSS	= (1 << 0), /* host supports slave dev */
 					    /* (doesn't imply presence) */
 	ATA_FLAG_SATA		= (1 << 1),
+	ATA_FLAG_NO_LPM		= (1 << 2), /* host not happy with LPM */
 	ATA_FLAG_NO_LOG_PAGE	= (1 << 5), /* do not issue log page read */
 	ATA_FLAG_NO_ATAPI	= (1 << 6), /* No ATAPI support */
 	ATA_FLAG_PIO_DMA	= (1 << 7), /* PIO cmds via DMA */
diff -druNp --no-dereference linux-libre-4.9.112-gnu/kernel/power/user.c linux-libre-4.9.113-gnu/kernel/power/user.c
--- linux-libre-4.9.112-gnu/kernel/power/user.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/kernel/power/user.c	2018-07-17 05:37:54.000000000 -0400
@@ -186,6 +186,11 @@ static ssize_t snapshot_write(struct fil
 		res = PAGE_SIZE - pg_offp;
 	}
 
+	if (!data_of(data->handle)) {
+		res = -EINVAL;
+		goto unlock;
+	}
+
 	res = simple_write_to_buffer(data_of(data->handle), res, &pg_offp,
 			buf, count);
 	if (res > 0)
diff -druNp --no-dereference linux-libre-4.9.112-gnu/Makefile linux-libre-4.9.113-gnu/Makefile
--- linux-libre-4.9.112-gnu/Makefile	2018-07-12 23:57:55.000000000 -0400
+++ linux-libre-4.9.113-gnu/Makefile	2018-07-17 14:37:26.000000000 -0400
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 9
-SUBLEVEL = 112
+SUBLEVEL = 113
 EXTRAVERSION = -gnu
 NAME = Roaring Lionus
 
diff -druNp --no-dereference linux-libre-4.9.112-gnu/net/bridge/netfilter/ebtables.c linux-libre-4.9.113-gnu/net/bridge/netfilter/ebtables.c
--- linux-libre-4.9.112-gnu/net/bridge/netfilter/ebtables.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/net/bridge/netfilter/ebtables.c	2018-07-17 05:37:54.000000000 -0400
@@ -704,6 +704,8 @@ ebt_check_entry(struct ebt_entry *e, str
 	}
 	i = 0;
 
+	memset(&mtpar, 0, sizeof(mtpar));
+	memset(&tgpar, 0, sizeof(tgpar));
 	mtpar.net	= tgpar.net       = net;
 	mtpar.table     = tgpar.table     = name;
 	mtpar.entryinfo = tgpar.entryinfo = e;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/net/ipv4/netfilter/ip_tables.c linux-libre-4.9.113-gnu/net/ipv4/netfilter/ip_tables.c
--- linux-libre-4.9.112-gnu/net/ipv4/netfilter/ip_tables.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/net/ipv4/netfilter/ip_tables.c	2018-07-17 05:37:54.000000000 -0400
@@ -554,6 +554,7 @@ find_check_entry(struct ipt_entry *e, st
 		return -ENOMEM;
 
 	j = 0;
+	memset(&mtpar, 0, sizeof(mtpar));
 	mtpar.net	= net;
 	mtpar.table     = name;
 	mtpar.entryinfo = &e->ip;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/net/ipv6/netfilter/ip6_tables.c linux-libre-4.9.113-gnu/net/ipv6/netfilter/ip6_tables.c
--- linux-libre-4.9.112-gnu/net/ipv6/netfilter/ip6_tables.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/net/ipv6/netfilter/ip6_tables.c	2018-07-17 05:37:54.000000000 -0400
@@ -584,6 +584,7 @@ find_check_entry(struct ip6t_entry *e, s
 		return -ENOMEM;
 
 	j = 0;
+	memset(&mtpar, 0, sizeof(mtpar));
 	mtpar.net	= net;
 	mtpar.table     = name;
 	mtpar.entryinfo = &e->ipv6;
diff -druNp --no-dereference linux-libre-4.9.112-gnu/net/netfilter/nfnetlink_queue.c linux-libre-4.9.113-gnu/net/netfilter/nfnetlink_queue.c
--- linux-libre-4.9.112-gnu/net/netfilter/nfnetlink_queue.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/net/netfilter/nfnetlink_queue.c	2018-07-17 05:37:54.000000000 -0400
@@ -1210,6 +1210,9 @@ static int nfqnl_recv_unsupp(struct net
 static const struct nla_policy nfqa_cfg_policy[NFQA_CFG_MAX+1] = {
 	[NFQA_CFG_CMD]		= { .len = sizeof(struct nfqnl_msg_config_cmd) },
 	[NFQA_CFG_PARAMS]	= { .len = sizeof(struct nfqnl_msg_config_params) },
+	[NFQA_CFG_QUEUE_MAXLEN]	= { .type = NLA_U32 },
+	[NFQA_CFG_MASK]		= { .type = NLA_U32 },
+	[NFQA_CFG_FLAGS]	= { .type = NLA_U32 },
 };
 
 static const struct nf_queue_handler nfqh = {
diff -druNp --no-dereference linux-libre-4.9.112-gnu/sound/pci/hda/patch_hdmi.c linux-libre-4.9.113-gnu/sound/pci/hda/patch_hdmi.c
--- linux-libre-4.9.112-gnu/sound/pci/hda/patch_hdmi.c	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/sound/pci/hda/patch_hdmi.c	2018-07-17 05:37:54.000000000 -0400
@@ -33,6 +33,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include <linux/pm_runtime.h>
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/asoundef.h>
@@ -731,8 +732,10 @@ static void check_presence_and_report(st
 
 	if (pin_idx < 0)
 		return;
+	mutex_lock(&spec->pcm_lock);
 	if (hdmi_present_sense(get_pin(spec, pin_idx), 1))
 		snd_hda_jack_report_sync(codec);
+	mutex_unlock(&spec->pcm_lock);
 }
 
 static void jack_callback(struct hda_codec *codec,
@@ -1521,21 +1524,23 @@ static void sync_eld_via_acomp(struct hd
 static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll)
 {
 	struct hda_codec *codec = per_pin->codec;
-	struct hdmi_spec *spec = codec->spec;
 	int ret;
 
 	/* no temporary power up/down needed for component notifier */
-	if (!codec_has_acomp(codec))
-		snd_hda_power_up_pm(codec);
+	if (!codec_has_acomp(codec)) {
+		ret = snd_hda_power_up_pm(codec);
+		if (ret < 0 && pm_runtime_suspended(hda_codec_dev(codec))) {
+			snd_hda_power_down_pm(codec);
+			return false;
+		}
+	}
 
-	mutex_lock(&spec->pcm_lock);
 	if (codec_has_acomp(codec)) {
 		sync_eld_via_acomp(codec, per_pin);
 		ret = false; /* don't call snd_hda_jack_report_sync() */
 	} else {
 		ret = hdmi_present_sense_via_verbs(per_pin, repoll);
 	}
-	mutex_unlock(&spec->pcm_lock);
 
 	if (!codec_has_acomp(codec))
 		snd_hda_power_down_pm(codec);
@@ -1547,12 +1552,16 @@ static void hdmi_repoll_eld(struct work_
 {
 	struct hdmi_spec_per_pin *per_pin =
 	container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work);
+	struct hda_codec *codec = per_pin->codec;
+	struct hdmi_spec *spec = codec->spec;
 
 	if (per_pin->repoll_count++ > 6)
 		per_pin->repoll_count = 0;
 
+	mutex_lock(&spec->pcm_lock);
 	if (hdmi_present_sense(per_pin, per_pin->repoll_count))
 		snd_hda_jack_report_sync(per_pin->codec);
+	mutex_unlock(&spec->pcm_lock);
 }
 
 static void intel_haswell_fixup_connect_list(struct hda_codec *codec,
diff -druNp --no-dereference linux-libre-4.9.112-gnu/tools/build/Build.include linux-libre-4.9.113-gnu/tools/build/Build.include
--- linux-libre-4.9.112-gnu/tools/build/Build.include	2018-07-11 10:26:46.000000000 -0400
+++ linux-libre-4.9.113-gnu/tools/build/Build.include	2018-07-17 05:37:54.000000000 -0400
@@ -63,8 +63,8 @@ dep-cmd = $(if $(wildcard $(fixdep)),
            $(fixdep) $(depfile) $@ '$(make-cmd)' > $(dot-target).tmp;           \
            rm -f $(depfile);                                                    \
            mv -f $(dot-target).tmp $(dot-target).cmd,                           \
-           printf '\# cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
-           printf '\# using basic dep data\n\n' >> $(dot-target).cmd;           \
+           printf '$(pound) cannot find fixdep (%s)\n' $(fixdep) > $(dot-target).cmd; \
+           printf '$(pound) using basic dep data\n\n' >> $(dot-target).cmd;           \
            cat $(depfile) >> $(dot-target).cmd;                                 \
            printf '%s\n' 'cmd_$@ := $(make-cmd)' >> $(dot-target).cmd)
 
