diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-06 18:56:25 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-01-06 18:56:25 +0100 |
| commit | eb398ce13596402f8f3704acd73df3367cb8b215 (patch) | |
| tree | 0b52ea12aa8db0c49a5ac2e87715ffd7b0d232fe | |
| parent | d0c35e9fe71827b25c4dce57582b2748dbb0329b (diff) | |
| parent | 75fed581f6cea7756711a5453489d805d5576563 (diff) | |
| download | kernel-eb398ce13596402f8f3704acd73df3367cb8b215.tar.gz kernel-eb398ce13596402f8f3704acd73df3367cb8b215.tar.xz kernel-eb398ce13596402f8f3704acd73df3367cb8b215.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-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-- | gitrev | 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 | 10 |
8 files changed, 21 insertions, 11 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 @@ -1 +1 @@ -bed723519a72c0f68fbfaf68ed5bf55d04e46566 +c79f46a282390e0f5b306007bf7b11a46d529538 diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 1b0be4a65..bfc34e075 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -3096,8 +3096,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 14098ba19..203183ff0 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3077,8 +3077,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 36bd621d6..aa0b8b9ad 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3144,8 +3144,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 1fd145a4e..6f410b9fc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3125,8 +3125,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 4ff80b36e..a2bce0970 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2909,6 +2909,16 @@ 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 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc5.git0.1 +- Linux v5.5-rc5 + +* Mon Jan 06 2020 Justin M. Forbes <jforbes@fedoraproject.org> +- Disable debugging options. + * Fri Jan 03 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc4.git2.1 - Linux v5.5-rc4-116-gbed723519a72 |