From: Greg Kroah-Hartman Date: Mon, 5 Jun 2017 12:22:31 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v3.18.56~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee7dc1e0439a6efc2a782a286c43071aacd246fc;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: acpi-nfit-fix-the-memory-error-check-in-nfit_handle_mce.patch crypto-skcipher-add-missing-api-setkey-checks.patch drivers-tty-8250-only-call-fintek_8250_probe-when-doing-port-i-o.patch fs-ufs-set-ufs-default-maximum-bytes-per-file.patch i2c-i2c-tiny-usb-fix-buffer-not-being-dma-capable.patch mmc-sdhci-iproc-suppress-spurious-interrupt-with-multiblock-read.patch powerpc-spufs-fix-hash-faults-for-kernel-regions.patch revert-acpi-button-change-default-behavior-to-lid_init_state-open.patch --- diff --git a/queue-4.9/acpi-nfit-fix-the-memory-error-check-in-nfit_handle_mce.patch b/queue-4.9/acpi-nfit-fix-the-memory-error-check-in-nfit_handle_mce.patch new file mode 100644 index 00000000000..095c815d0db --- /dev/null +++ b/queue-4.9/acpi-nfit-fix-the-memory-error-check-in-nfit_handle_mce.patch @@ -0,0 +1,35 @@ +From fc08a4703a418a398bbb575ac311d36d110ac786 Mon Sep 17 00:00:00 2001 +From: Vishal Verma +Date: Fri, 19 May 2017 11:39:10 +0200 +Subject: acpi, nfit: Fix the memory error check in nfit_handle_mce() + +From: Vishal Verma + +commit fc08a4703a418a398bbb575ac311d36d110ac786 upstream. + +The check for an MCE being a memory error in the NFIT mce handler was +bogus. Use the new mce_is_memory_error() helper to detect the error +properly. + +Reported-by: Tony Luck +Signed-off-by: Vishal Verma +Signed-off-by: Borislav Petkov +Link: http://lkml.kernel.org/r/20170519093915.15413-3-bp@alien8.de +Signed-off-by: Thomas Gleixner +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/nfit/mce.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/nfit/mce.c ++++ b/drivers/acpi/nfit/mce.c +@@ -26,7 +26,7 @@ static int nfit_handle_mce(struct notifi + struct nfit_spa *nfit_spa; + + /* We only care about memory errors */ +- if (!(mce->status & MCACOD)) ++ if (!mce_is_memory_error(mce)) + return NOTIFY_DONE; + + /* diff --git a/queue-4.9/crypto-skcipher-add-missing-api-setkey-checks.patch b/queue-4.9/crypto-skcipher-add-missing-api-setkey-checks.patch new file mode 100644 index 00000000000..8a09ec40d61 --- /dev/null +++ b/queue-4.9/crypto-skcipher-add-missing-api-setkey-checks.patch @@ -0,0 +1,77 @@ +From 9933e113c2e87a9f46a40fde8dafbf801dca1ab9 Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Wed, 10 May 2017 03:48:23 +0800 +Subject: crypto: skcipher - Add missing API setkey checks + +From: Herbert Xu + +commit 9933e113c2e87a9f46a40fde8dafbf801dca1ab9 upstream. + +The API setkey checks for key sizes and alignment went AWOL during the +skcipher conversion. This patch restores them. + +Fixes: 4e6c3df4d729 ("crypto: skcipher - Add low-level skcipher...") +Reported-by: Baozeng +Signed-off-by: Herbert Xu +Signed-off-by: Greg Kroah-Hartman + +--- + crypto/skcipher.c | 40 +++++++++++++++++++++++++++++++++++++++- + 1 file changed, 39 insertions(+), 1 deletion(-) + +--- a/crypto/skcipher.c ++++ b/crypto/skcipher.c +@@ -221,6 +221,44 @@ static int crypto_init_skcipher_ops_ablk + return 0; + } + ++static int skcipher_setkey_unaligned(struct crypto_skcipher *tfm, ++ const u8 *key, unsigned int keylen) ++{ ++ unsigned long alignmask = crypto_skcipher_alignmask(tfm); ++ struct skcipher_alg *cipher = crypto_skcipher_alg(tfm); ++ u8 *buffer, *alignbuffer; ++ unsigned long absize; ++ int ret; ++ ++ absize = keylen + alignmask; ++ buffer = kmalloc(absize, GFP_ATOMIC); ++ if (!buffer) ++ return -ENOMEM; ++ ++ alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); ++ memcpy(alignbuffer, key, keylen); ++ ret = cipher->setkey(tfm, alignbuffer, keylen); ++ kzfree(buffer); ++ return ret; ++} ++ ++static int skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key, ++ unsigned int keylen) ++{ ++ struct skcipher_alg *cipher = crypto_skcipher_alg(tfm); ++ unsigned long alignmask = crypto_skcipher_alignmask(tfm); ++ ++ if (keylen < cipher->min_keysize || keylen > cipher->max_keysize) { ++ crypto_skcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN); ++ return -EINVAL; ++ } ++ ++ if ((unsigned long)key & alignmask) ++ return skcipher_setkey_unaligned(tfm, key, keylen); ++ ++ return cipher->setkey(tfm, key, keylen); ++} ++ + static void crypto_skcipher_exit_tfm(struct crypto_tfm *tfm) + { + struct crypto_skcipher *skcipher = __crypto_skcipher_cast(tfm); +@@ -241,7 +279,7 @@ static int crypto_skcipher_init_tfm(stru + tfm->__crt_alg->cra_type == &crypto_givcipher_type) + return crypto_init_skcipher_ops_ablkcipher(tfm); + +- skcipher->setkey = alg->setkey; ++ skcipher->setkey = skcipher_setkey; + skcipher->encrypt = alg->encrypt; + skcipher->decrypt = alg->decrypt; + skcipher->ivsize = alg->ivsize; diff --git a/queue-4.9/drivers-tty-8250-only-call-fintek_8250_probe-when-doing-port-i-o.patch b/queue-4.9/drivers-tty-8250-only-call-fintek_8250_probe-when-doing-port-i-o.patch new file mode 100644 index 00000000000..b91da27469d --- /dev/null +++ b/queue-4.9/drivers-tty-8250-only-call-fintek_8250_probe-when-doing-port-i-o.patch @@ -0,0 +1,49 @@ +From 4c4fc90964b1cf205a67df566cc82ea1731bcb00 Mon Sep 17 00:00:00 2001 +From: Ard Biesheuvel +Date: Thu, 18 May 2017 12:29:55 +0100 +Subject: drivers/tty: 8250: only call fintek_8250_probe when doing port I/O + +From: Ard Biesheuvel + +commit 4c4fc90964b1cf205a67df566cc82ea1731bcb00 upstream. + +Commit fa01e2ca9f53 ("serial: 8250: Integrate Fintek into 8250_base") +modified the probing logic for PNP0501 devices, to remove a collision +between the generic 16550A driver and the Fintek driver, which reused +the same ACPI _HID. + +The Fintek device probe is now incorporated into the common 8250 probe +path, and gets called for all discovered 16550A compatible devices, +including ones that are MMIO mapped rather than IO mapped. However, +the Fintek driver assumes the port base is a I/O address, and proceeds +to probe some arbitrary offsets above it. + +This is generally a wrong thing to do, but on ARM systems (having no +native port I/O), this may result in faulting accesses of completely +unrelated MMIO regions in the PCI I/O space. Given that this is at +serial probe time, this results in hard to diagnose crashes at boot. + +So let's restrict the Fintek probe to devices that we know are using +port I/O in the first place. + +Fixes: fa01e2ca9f53 ("serial: 8250: Integrate Fintek into 8250_base") +Suggested-by: Arnd Bergmann +Reviewed-by: Ricardo Ribalda +Signed-off-by: Ard Biesheuvel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/tty/serial/8250/8250_port.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/tty/serial/8250/8250_port.c ++++ b/drivers/tty/serial/8250/8250_port.c +@@ -1320,7 +1320,7 @@ out_lock: + /* + * Check if the device is a Fintek F81216A + */ +- if (port->type == PORT_16550A) ++ if (port->type == PORT_16550A && port->iotype == UPIO_PORT) + fintek_8250_probe(up); + + if (up->capabilities != old_capabilities) { diff --git a/queue-4.9/fs-ufs-set-ufs-default-maximum-bytes-per-file.patch b/queue-4.9/fs-ufs-set-ufs-default-maximum-bytes-per-file.patch new file mode 100644 index 00000000000..9f447c84c92 --- /dev/null +++ b/queue-4.9/fs-ufs-set-ufs-default-maximum-bytes-per-file.patch @@ -0,0 +1,50 @@ +From 239e250e4acbc0104d514307029c0839e834a51a Mon Sep 17 00:00:00 2001 +From: Richard Narron +Date: Sun, 4 Jun 2017 16:23:18 -0700 +Subject: fs/ufs: Set UFS default maximum bytes per file + +From: Richard Narron + +commit 239e250e4acbc0104d514307029c0839e834a51a upstream. + +This fixes a problem with reading files larger than 2GB from a UFS-2 +file system: + + https://bugzilla.kernel.org/show_bug.cgi?id=195721 + +The incorrect UFS s_maxsize limit became a problem as of commit +c2a9737f45e2 ("vfs,mm: fix a dead loop in truncate_inode_pages_range()") +which started using s_maxbytes to avoid a page index overflow in +do_generic_file_read(). + +That caused files to be truncated on UFS-2 file systems because the +default maximum file size is 2GB (MAX_NON_LFS) and UFS didn't update it. + +Here I simply increase the default to a common value used by other file +systems. + +Signed-off-by: Richard Narron +Cc: Al Viro +Cc: Will B +Cc: Theodore Ts'o +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/ufs/super.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +--- a/fs/ufs/super.c ++++ b/fs/ufs/super.c +@@ -812,9 +812,8 @@ static int ufs_fill_super(struct super_b + uspi->s_dirblksize = UFS_SECTOR_SIZE; + super_block_offset=UFS_SBLOCK; + +- /* Keep 2Gig file limit. Some UFS variants need to override +- this but as I don't know which I'll let those in the know loosen +- the rules */ ++ sb->s_maxbytes = MAX_LFS_FILESIZE; ++ + switch (sbi->s_mount_opt & UFS_MOUNT_UFSTYPE) { + case UFS_MOUNT_UFSTYPE_44BSD: + UFSD("ufstype=44bsd\n"); diff --git a/queue-4.9/i2c-i2c-tiny-usb-fix-buffer-not-being-dma-capable.patch b/queue-4.9/i2c-i2c-tiny-usb-fix-buffer-not-being-dma-capable.patch new file mode 100644 index 00000000000..8a6d3b4b52a --- /dev/null +++ b/queue-4.9/i2c-i2c-tiny-usb-fix-buffer-not-being-dma-capable.patch @@ -0,0 +1,104 @@ +From 5165da5923d6c7df6f2927b0113b2e4d9288661e Mon Sep 17 00:00:00 2001 +From: Sebastian Reichel +Date: Fri, 5 May 2017 11:06:50 +0200 +Subject: i2c: i2c-tiny-usb: fix buffer not being DMA capable + +From: Sebastian Reichel + +commit 5165da5923d6c7df6f2927b0113b2e4d9288661e upstream. + +Since v4.9 i2c-tiny-usb generates the below call trace +and longer works, since it can't communicate with the +USB device. The reason is, that since v4.9 the USB +stack checks, that the buffer it should transfer is DMA +capable. This was a requirement since v2.2 days, but it +usually worked nevertheless. + +[ 17.504959] ------------[ cut here ]------------ +[ 17.505488] WARNING: CPU: 0 PID: 93 at drivers/usb/core/hcd.c:1587 usb_hcd_map_urb_for_dma+0x37c/0x570 +[ 17.506545] transfer buffer not dma capable +[ 17.507022] Modules linked in: +[ 17.507370] CPU: 0 PID: 93 Comm: i2cdetect Not tainted 4.11.0-rc8+ #10 +[ 17.508103] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.10.2-1 04/01/2014 +[ 17.509039] Call Trace: +[ 17.509320] ? dump_stack+0x5c/0x78 +[ 17.509714] ? __warn+0xbe/0xe0 +[ 17.510073] ? warn_slowpath_fmt+0x5a/0x80 +[ 17.510532] ? nommu_map_sg+0xb0/0xb0 +[ 17.510949] ? usb_hcd_map_urb_for_dma+0x37c/0x570 +[ 17.511482] ? usb_hcd_submit_urb+0x336/0xab0 +[ 17.511976] ? wait_for_completion_timeout+0x12f/0x1a0 +[ 17.512549] ? wait_for_completion_timeout+0x65/0x1a0 +[ 17.513125] ? usb_start_wait_urb+0x65/0x160 +[ 17.513604] ? usb_control_msg+0xdc/0x130 +[ 17.514061] ? usb_xfer+0xa4/0x2a0 +[ 17.514445] ? __i2c_transfer+0x108/0x3c0 +[ 17.514899] ? i2c_transfer+0x57/0xb0 +[ 17.515310] ? i2c_smbus_xfer_emulated+0x12f/0x590 +[ 17.515851] ? _raw_spin_unlock_irqrestore+0x11/0x20 +[ 17.516408] ? i2c_smbus_xfer+0x125/0x330 +[ 17.516876] ? i2c_smbus_xfer+0x125/0x330 +[ 17.517329] ? i2cdev_ioctl_smbus+0x1c1/0x2b0 +[ 17.517824] ? i2cdev_ioctl+0x75/0x1c0 +[ 17.518248] ? do_vfs_ioctl+0x9f/0x600 +[ 17.518671] ? vfs_write+0x144/0x190 +[ 17.519078] ? SyS_ioctl+0x74/0x80 +[ 17.519463] ? entry_SYSCALL_64_fastpath+0x1e/0xad +[ 17.519959] ---[ end trace d047c04982f5ac50 ]--- + +Signed-off-by: Sebastian Reichel +Reviewed-by: Greg Kroah-Hartman +Acked-by: Till Harbaum +Signed-off-by: Wolfram Sang +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/i2c/busses/i2c-tiny-usb.c | 25 +++++++++++++++++++++---- + 1 file changed, 21 insertions(+), 4 deletions(-) + +--- a/drivers/i2c/busses/i2c-tiny-usb.c ++++ b/drivers/i2c/busses/i2c-tiny-usb.c +@@ -178,22 +178,39 @@ static int usb_read(struct i2c_adapter * + int value, int index, void *data, int len) + { + struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data; ++ void *dmadata = kmalloc(len, GFP_KERNEL); ++ int ret; ++ ++ if (!dmadata) ++ return -ENOMEM; + + /* do control transfer */ +- return usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0), ++ ret = usb_control_msg(dev->usb_dev, usb_rcvctrlpipe(dev->usb_dev, 0), + cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE | +- USB_DIR_IN, value, index, data, len, 2000); ++ USB_DIR_IN, value, index, dmadata, len, 2000); ++ ++ memcpy(data, dmadata, len); ++ kfree(dmadata); ++ return ret; + } + + static int usb_write(struct i2c_adapter *adapter, int cmd, + int value, int index, void *data, int len) + { + struct i2c_tiny_usb *dev = (struct i2c_tiny_usb *)adapter->algo_data; ++ void *dmadata = kmemdup(data, len, GFP_KERNEL); ++ int ret; ++ ++ if (!dmadata) ++ return -ENOMEM; + + /* do control transfer */ +- return usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0), ++ ret = usb_control_msg(dev->usb_dev, usb_sndctrlpipe(dev->usb_dev, 0), + cmd, USB_TYPE_VENDOR | USB_RECIP_INTERFACE, +- value, index, data, len, 2000); ++ value, index, dmadata, len, 2000); ++ ++ kfree(dmadata); ++ return ret; + } + + static void i2c_tiny_usb_free(struct i2c_tiny_usb *dev) diff --git a/queue-4.9/mmc-sdhci-iproc-suppress-spurious-interrupt-with-multiblock-read.patch b/queue-4.9/mmc-sdhci-iproc-suppress-spurious-interrupt-with-multiblock-read.patch new file mode 100644 index 00000000000..430f8276d11 --- /dev/null +++ b/queue-4.9/mmc-sdhci-iproc-suppress-spurious-interrupt-with-multiblock-read.patch @@ -0,0 +1,45 @@ +From f5f968f2371ccdebb8a365487649673c9af68d09 Mon Sep 17 00:00:00 2001 +From: Srinath Mannam +Date: Thu, 18 May 2017 22:27:40 +0530 +Subject: mmc: sdhci-iproc: suppress spurious interrupt with Multiblock read + +From: Srinath Mannam + +commit f5f968f2371ccdebb8a365487649673c9af68d09 upstream. + +The stingray SDHCI hardware supports ACMD12 and automatically +issues after multi block transfer completed. + +If ACMD12 in SDHCI is disabled, spurious tx done interrupts are seen +on multi block read command with below error message: + +Got data interrupt 0x00000002 even though no data +operation was in progress. + +This patch uses SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 to enable +ACM12 support in SDHCI hardware and suppress spurious interrupt. + +Signed-off-by: Srinath Mannam +Reviewed-by: Ray Jui +Reviewed-by: Scott Branden +Acked-by: Adrian Hunter +Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/mmc/host/sdhci-iproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/mmc/host/sdhci-iproc.c ++++ b/drivers/mmc/host/sdhci-iproc.c +@@ -157,7 +157,8 @@ static const struct sdhci_ops sdhci_ipro + }; + + static const struct sdhci_pltfm_data sdhci_iproc_pltfm_data = { +- .quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK, ++ .quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | ++ SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12, + .quirks2 = SDHCI_QUIRK2_ACMD23_BROKEN, + .ops = &sdhci_iproc_ops, + }; diff --git a/queue-4.9/powerpc-spufs-fix-hash-faults-for-kernel-regions.patch b/queue-4.9/powerpc-spufs-fix-hash-faults-for-kernel-regions.patch new file mode 100644 index 00000000000..68312833c55 --- /dev/null +++ b/queue-4.9/powerpc-spufs-fix-hash-faults-for-kernel-regions.patch @@ -0,0 +1,45 @@ +From d75e4919cc0b6fbcbc8d6654ef66d87a9dbf1526 Mon Sep 17 00:00:00 2001 +From: Jeremy Kerr +Date: Wed, 24 May 2017 16:49:59 +1000 +Subject: powerpc/spufs: Fix hash faults for kernel regions + +From: Jeremy Kerr + +commit d75e4919cc0b6fbcbc8d6654ef66d87a9dbf1526 upstream. + +Commit ac29c64089b7 ("powerpc/mm: Replace _PAGE_USER with +_PAGE_PRIVILEGED") swapped _PAGE_USER for _PAGE_PRIVILEGED, and +introduced check_pte_access() which denied kernel access to +non-_PAGE_PRIVILEGED pages. + +However, it didn't add _PAGE_PRIVILEGED to the hash fault handler +for spufs' kernel accesses, so the DMAs required to establish SPE +memory no longer work. + +This change adds _PAGE_PRIVILEGED to the hash fault handler for +kernel accesses. + +Fixes: ac29c64089b7 ("powerpc/mm: Replace _PAGE_USER with _PAGE_PRIVILEGED") +Signed-off-by: Jeremy Kerr +Reported-by: Sombat Tragolgosol +Reviewed-by: Aneesh Kumar K.V +Signed-off-by: Michael Ellerman +Signed-off-by: Greg Kroah-Hartman + +--- + arch/powerpc/platforms/cell/spu_base.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/arch/powerpc/platforms/cell/spu_base.c ++++ b/arch/powerpc/platforms/cell/spu_base.c +@@ -197,7 +197,9 @@ static int __spu_trap_data_map(struct sp + (REGION_ID(ea) != USER_REGION_ID)) { + + spin_unlock(&spu->register_lock); +- ret = hash_page(ea, _PAGE_PRESENT | _PAGE_READ, 0x300, dsisr); ++ ret = hash_page(ea, ++ _PAGE_PRESENT | _PAGE_READ | _PAGE_PRIVILEGED, ++ 0x300, dsisr); + spin_lock(&spu->register_lock); + + if (!ret) { diff --git a/queue-4.9/revert-acpi-button-change-default-behavior-to-lid_init_state-open.patch b/queue-4.9/revert-acpi-button-change-default-behavior-to-lid_init_state-open.patch new file mode 100644 index 00000000000..0b5e88bd58f --- /dev/null +++ b/queue-4.9/revert-acpi-button-change-default-behavior-to-lid_init_state-open.patch @@ -0,0 +1,67 @@ +From 878d8db039daac0938238e9a40a5bd6e50ee3c9b Mon Sep 17 00:00:00 2001 +From: Benjamin Tissoires +Date: Wed, 10 May 2017 18:12:40 +0200 +Subject: Revert "ACPI / button: Change default behavior to lid_init_state=open" + +From: Benjamin Tissoires + +commit 878d8db039daac0938238e9a40a5bd6e50ee3c9b upstream. + +Revert commit 77e9a4aa9de1 (ACPI / button: Change default behavior to +lid_init_state=open) which changed the kernel's behavior on laptops +that boot with closed lids and expect the lid switch state to be +reported accurately by the kernel. + +If you boot or resume your laptop with the lid closed on a docking +station while using an external monitor connected to it, both internal +and external displays will light on, while only the external should. + +There is a design choice in gdm to only provide the greeter on the +internal display when lit on, so users only see a gray area on the +external monitor. Also, the cursor will not show up as it's by +default on the internal display too. + +To "fix" that, users have to open the laptop once and close it once +again to sync the state of the switch with the hardware state. + +Even if the "method" operation mode implementation can be buggy on +some platforms, the "open" choice is worse. It breaks docking +stations basically and there is no way to have a user-space hwdb to +fix that. + +On the contrary, it's rather easy in user-space to have a hwdb +with the problematic platforms. Then, libinput (1.7.0+) can fix +the state of the lid switch for us: you need to set the udev +property LIBINPUT_ATTR_LID_SWITCH_RELIABILITY to 'write_open'. + +When libinput detects internal keyboard events, it will overwrite the +state of the switch to open, making it reliable again. Given that +logind only checks the lid switch value after a timeout, we can +assume the user will use the internal keyboard before this timeout +expires. + +For example, such a hwdb entry is: + +libinput:name:*Lid Switch*:dmi:*svnMicrosoftCorporation:pnSurface3:* + LIBINPUT_ATTR_LID_SWITCH_RELIABILITY=write_open + +Link: https://bugzilla.gnome.org/show_bug.cgi?id=782380 +Signed-off-by: Benjamin Tissoires +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/acpi/button.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/button.c ++++ b/drivers/acpi/button.c +@@ -113,7 +113,7 @@ struct acpi_button { + + static BLOCKING_NOTIFIER_HEAD(acpi_lid_notifier); + static struct acpi_device *lid_device; +-static u8 lid_init_state = ACPI_BUTTON_LID_INIT_OPEN; ++static u8 lid_init_state = ACPI_BUTTON_LID_INIT_METHOD; + + static unsigned long lid_report_interval __read_mostly = 500; + module_param(lid_report_interval, ulong, 0644); diff --git a/queue-4.9/series b/queue-4.9/series index eedbed3299d..b30b570bd78 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -34,3 +34,11 @@ ipv4-add-reference-counting-to-metrics.patch bpf-add-bpf_clone_redirect-to-bpf_helper_changes_pkt_data.patch sparc-fix-wstringop-overflow-warning.patch sparc-ftrace-fix-ftrace-graph-time-measurement.patch +fs-ufs-set-ufs-default-maximum-bytes-per-file.patch +powerpc-spufs-fix-hash-faults-for-kernel-regions.patch +drivers-tty-8250-only-call-fintek_8250_probe-when-doing-port-i-o.patch +i2c-i2c-tiny-usb-fix-buffer-not-being-dma-capable.patch +crypto-skcipher-add-missing-api-setkey-checks.patch +acpi-nfit-fix-the-memory-error-check-in-nfit_handle_mce.patch +revert-acpi-button-change-default-behavior-to-lid_init_state-open.patch +mmc-sdhci-iproc-suppress-spurious-interrupt-with-multiblock-read.patch