diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2018-02-09 16:05:09 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2018-02-09 16:05:09 -0600 |
| commit | c0815482a6a1f326b0626304698838e6b9f3ad21 (patch) | |
| tree | 1484e9264e07eb3edd525ff40830dfa2a12d388f | |
| parent | f8bdcf89c2e51095ac60ec50e0fa9bdf5b605a20 (diff) | |
| download | kernel-c0815482a6a1f326b0626304698838e6b9f3ad21.tar.gz kernel-c0815482a6a1f326b0626304698838e6b9f3ad21.tar.xz kernel-c0815482a6a1f326b0626304698838e6b9f3ad21.zip | |
Linux v4.15-12216-gf9f1e414128e
27 files changed, 53 insertions, 47 deletions
diff --git a/ACPI-sbshc-remove-raw-pointer-from-printk-message.patch b/ACPI-sbshc-remove-raw-pointer-from-printk-message.patch deleted file mode 100644 index 0aa10d0af..000000000 --- a/ACPI-sbshc-remove-raw-pointer-from-printk-message.patch +++ /dev/null @@ -1,41 +0,0 @@ -From patchwork Fri Jan 19 09:06:03 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: ACPI: sbshc: remove raw pointer from printk message -From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org> -X-Patchwork-Id: 10174835 -Message-Id: <20180119090603.GA7775@kroah.com> -To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org> -Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, - Wang Qize <wang_qize@venustech.com.cn> -Date: Fri, 19 Jan 2018 10:06:03 +0100 - -There's no need to be printing a raw kernel pointer to the kernel log at -every boot. So just remove it, and change the whole message to use the -correct dev_info() call at the same time. - -Reported-by: Wang Qize <wang_qize@venustech.com.cn> -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> ---- -To unsubscribe from this list: send the line "unsubscribe linux-acpi" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - -diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c -index 2fa8304171e0..217e1caf58d6 100644 ---- a/drivers/acpi/sbshc.c -+++ b/drivers/acpi/sbshc.c -@@ -275,8 +275,8 @@ static int acpi_smbus_hc_add(struct acpi_device *device) - device->driver_data = hc; - - acpi_ec_add_query_handler(hc->ec, hc->query_bit, NULL, smbus_alarm, hc); -- printk(KERN_INFO PREFIX "SBS HC: EC = 0x%p, offset = 0x%0x, query_bit = 0x%0x\n", -- hc->ec, hc->offset, hc->query_bit); -+ dev_info(&device->dev, "SBS HC: offset = 0x%0x, query_bit = 0x%0x\n", -+ hc->offset, hc->query_bit); - - return 0; - } diff --git a/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE b/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE new file mode 100644 index 000000000..f8a19253c --- /dev/null +++ b/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE @@ -0,0 +1 @@ +CONFIG_ACPI_SPCR_TABLE=y diff --git a/configs/fedora/generic/CONFIG_VIRTIO_MENU b/configs/fedora/generic/CONFIG_VIRTIO_MENU new file mode 100644 index 000000000..ce9f283a8 --- /dev/null +++ b/configs/fedora/generic/CONFIG_VIRTIO_MENU @@ -0,0 +1 @@ +CONFIG_VIRTIO_MENU=y diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE b/configs/fedora/generic/s390x/CONFIG_EXPOLINE new file mode 100644 index 000000000..4fed3923a --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE @@ -0,0 +1 @@ +CONFIG_EXPOLINE=y diff --git a/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM new file mode 100644 index 000000000..82c8370c3 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_EXPOLINE_MEDIUM @@ -0,0 +1 @@ +CONFIG_EXPOLINE_MEDIUM=y diff --git a/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP new file mode 100644 index 000000000..b3c291602 --- /dev/null +++ b/configs/fedora/generic/s390x/CONFIG_KERNEL_NOBP @@ -0,0 +1 @@ +CONFIG_KERNEL_NOBP=y @@ -1 +1 @@ -581e400ff935d34d95811258586128bf11baef15 +f9f1e414128ea58d8e848a0275db0f644c9e9f45 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index dc7cd2093..d015fcbfe 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -67,6 +67,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_WATCHDOG=y @@ -6489,6 +6490,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index b76155b4c..1a690bdd4 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -67,6 +67,7 @@ CONFIG_ACPI_NUMA=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_PROCFS_POWER=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_WATCHDOG=y @@ -6464,6 +6465,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index a92517d44..a8247abac 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -7032,6 +7033,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index c0df222d5..525cb8b06 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -6582,6 +6583,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index ecdb166a1..d08e940c8 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -6557,6 +6558,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e3fdaa615..b74e3c9b4 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -7007,6 +7008,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 9b46ba594..4a5e77f30 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -76,6 +76,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6052,6 +6053,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 47bbb0c83..99fba307a 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -76,6 +76,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6076,6 +6077,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index d53d81d48..7a682e434 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -76,6 +76,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6076,6 +6077,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-i686.config b/kernel-i686.config index b0a46bd34..888c324d6 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -76,6 +76,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6052,6 +6053,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index eab4e4c3e..9141d5291 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -5834,6 +5835,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-ppc64.config b/kernel-ppc64.config index b5744992a..dc47eef5b 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -5808,6 +5809,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 359965e36..c405c955f 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -5762,6 +5763,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 007d20c4e..1fe78d28f 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -5736,6 +5737,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index c88e20277..1edbc05a8 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -1269,6 +1270,8 @@ CONFIG_ETHERNET=y # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set +CONFIG_EXPOLINE_MEDIUM=y +CONFIG_EXPOLINE=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -2289,6 +2292,7 @@ CONFIG_KDB_KEYBOARD=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set +CONFIG_KERNEL_NOBP=y # CONFIG_KEXEC_FILE is not set CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set @@ -5652,6 +5656,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-s390x.config b/kernel-s390x.config index 8ca6b2bfa..1bde46e6f 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -44,6 +44,7 @@ CONFIG_ACPI_ALS=m # CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_NFIT is not set CONFIG_ACPI_PCI_SLOT=y +CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -1257,6 +1258,8 @@ CONFIG_ETHERNET=y # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set # CONFIG_EXPERT is not set +CONFIG_EXPOLINE_MEDIUM=y +CONFIG_EXPOLINE=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set # CONFIG_EXT3_FS is not set @@ -2267,6 +2270,7 @@ CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set +CONFIG_KERNEL_NOBP=y # CONFIG_KEXEC_FILE is not set CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set @@ -5626,6 +5630,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 0b7653c47..8e290528e 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -79,6 +79,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6165,6 +6166,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel-x86_64.config b/kernel-x86_64.config index e38ee514e..2b674a156 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -79,6 +79,7 @@ CONFIG_ACPI_PROCFS=y CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y CONFIG_ACPI_SBS=m CONFIG_ACPI_SLEEP=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_ACPI_THERMAL=y CONFIG_ACPI_TOSHIBA=m @@ -6141,6 +6142,7 @@ CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m CONFIG_VIRTIO_NET=m diff --git a/kernel.spec b/kernel.spec index 65fc0ef72..09fe5faa4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 8 +%define gitrev 9 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -606,9 +606,6 @@ Patch619: input-rmi4-remove-the-need-for-artifical-IRQ.patch # rhbz 1509461 Patch625: v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch -# CVE-2018-5750 rhbz 1539706 1539708 -Patch651: ACPI-sbshc-remove-raw-pointer-from-printk-message.patch - # END OF PATCH DEFINITIONS %endif @@ -1867,6 +1864,9 @@ fi # # %changelog +* Fri Feb 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc0.git9.1 +- Linux v4.15-12216-gf9f1e414128e + * Thu Feb 08 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.16.0-0.rc0.git8.1 - Linux v4.15-11930-g581e400ff935 @@ -1,2 +1,2 @@ SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea -SHA512 (patch-4.15-git8.xz) = b2b12e663772e3ec3523038ced01d1ba1e205f7b5fb73cf0f8bd7c4a5be235aa5524c5a4ce0e2266104033875fed341a542fc3edaf32eb346072e37016cb39c3 +SHA512 (patch-4.15-git9.xz) = cdb5441140e663e203fe1e39f065bb0b2c6b05fe22e2a72c874e81bb19168eba111cf3bbde22e54dff9d463c8dc3956c1132574ccd59b52d69359427f3f6a4ce |