diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-06 22:24:31 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-06 22:24:31 +0100 |
commit | 3df2eaed53064d770bd67f739111f890fe635ac0 (patch) | |
tree | 7d10be0d6c946dc7ff45f30560ff0208eff611ef | |
parent | 1fff3feff80f5e65c0d60d9f85f542b87678425e (diff) | |
parent | 03cd5911df90de39983ea7774c8580e1f91bbf7d (diff) | |
download | kernel-3df2eaed53064d770bd67f739111f890fe635ac0.tar.gz kernel-3df2eaed53064d770bd67f739111f890fe635ac0.tar.xz kernel-3df2eaed53064d770bd67f739111f890fe635ac0.zip |
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI | 2 | ||||
-rw-r--r-- | configs/fedora/generic/x86/CONFIG_MFD_INTEL_LPSS_PCI | 2 | ||||
-rw-r--r-- | kernel-i686-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 4 | ||||
-rw-r--r-- | kernel.spec | 8 |
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-fedora.config b/kernel-i686-debug-fedora.config index c174b8623..b291a6225 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.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-fedora.config b/kernel-i686-fedora.config index e5c5bb988..0b02cbaf9 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.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-fedora.config b/kernel-x86_64-debug-fedora.config index 0cf92751d..f841b0e45 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.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-fedora.config b/kernel-x86_64-fedora.config index 48513f24b..a74b1643b 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.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 f79dd3c1e..2a0c54515 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2579,6 +2579,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-200 +- 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-200 - Linux v5.4.7 |