summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-01-06 22:24:34 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-01-06 22:24:34 +0100
commit8191e48ee8e573edf55d407f84bf87720c077e37 (patch)
tree233e13fa4369d0f8b34c62cdfc6563f5bdfc7f3c
parentd4e1648efa5951b6ea9694edad43b3471226a7f6 (diff)
parent6aca1ab02310821a9d3a6db9548ceb936558c7fb (diff)
downloadkernel-8191e48ee8e573edf55d407f84bf87720c077e37.tar.gz
kernel-8191e48ee8e573edf55d407f84bf87720c077e37.tar.xz
kernel-8191e48ee8e573edf55d407f84bf87720c077e37.zip
Merge remote-tracking branch 'origin/f30' into f30-user-thl-vanilla-fedora
-rw-r--r--configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI2
-rw-r--r--configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI2
-rw-r--r--kernel-i686-debug.config4
-rw-r--r--kernel-i686.config4
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config4
-rw-r--r--kernel.spec8
7 files changed, 18 insertions, 10 deletions
diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
index 7be3065fc..6c9f11d2e 100644
--- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
+++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
@@ -1 +1 @@
-CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
diff --git a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
index 93a430846..89c6ed411 100644
--- a/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
+++ b/configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI
@@ -1 +1 @@
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_PCI=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c174b8623..b291a6225 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3068,8 +3068,8 @@ CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index e5c5bb988..0b02cbaf9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3049,8 +3049,8 @@ CONFIG_MFD_CS5535=y
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0cf92751d..f841b0e45 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3116,8 +3116,8 @@ CONFIG_MFD_CROS_EC_DEV=m
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 48513f24b..a74b1643b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3097,8 +3097,8 @@ CONFIG_MFD_CROS_EC_DEV=m
# CONFIG_MFD_DA9150 is not set
# CONFIG_MFD_DLN2 is not set
# CONFIG_MFD_HI6421_PMIC is not set
-CONFIG_MFD_INTEL_LPSS_ACPI=m
-CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_INTEL_LPSS_ACPI=y
+CONFIG_MFD_INTEL_LPSS_PCI=y
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
diff --git a/kernel.spec b/kernel.spec
index a5c2ff6d9..ab6f65138 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1869,6 +1869,14 @@ fi
#
#
%changelog
+* Mon Jan 06 2020 Hans de Goede <hdegoede@redhat.com>
+- Make the MFD Intel LPSS driver builtin, some devices require this to be
+ available early during boot (rhbz#1787997)
+
+* Mon Jan 06 2020 Jeremy Cline <jcline@redhat.com> - 5.4.8-100
+- Linux v5.4.8
+- Fix a firmware load issue on some Intel wireless cards (rhbz 1788150)
+
* Tue Dec 31 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.4.7-100
- Linux v5.4.7