diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-10 13:18:06 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-10 13:18:06 +0100 |
commit | 136ffac98979b75444935f1feb5cbbbec006c70d (patch) | |
tree | 9a78e540fbf3ac220d82d5a4671883912e7d63b1 | |
parent | 5a723baa5d6e286f75543934f721a64211d1fede (diff) | |
parent | 72913f309d9dbec229f2be563dc676d23125d83f (diff) | |
download | kernel-136ffac98979b75444935f1feb5cbbbec006c70d.tar.gz kernel-136ffac98979b75444935f1feb5cbbbec006c70d.tar.xz kernel-136ffac98979b75444935f1feb5cbbbec006c70d.zip |
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
-rw-r--r-- | configs/fedora/generic/CONFIG_MXC4005 | 2 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_MXC6255 | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-aarch64-fedora.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-fedora.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 4 | ||||
-rw-r--r-- | kernel-i686-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-fedora.config | 4 | ||||
-rw-r--r-- | kernel-s390x-debug-fedora.config | 4 | ||||
-rw-r--r-- | kernel-s390x-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 | 3 |
17 files changed, 33 insertions, 30 deletions
diff --git a/configs/fedora/generic/CONFIG_MXC4005 b/configs/fedora/generic/CONFIG_MXC4005 index 609438732..01c15eab9 100644 --- a/configs/fedora/generic/CONFIG_MXC4005 +++ b/configs/fedora/generic/CONFIG_MXC4005 @@ -1 +1 @@ -# CONFIG_MXC4005 is not set +CONFIG_MXC4005=m diff --git a/configs/fedora/generic/CONFIG_MXC6255 b/configs/fedora/generic/CONFIG_MXC6255 index e834351d7..2a69adc2b 100644 --- a/configs/fedora/generic/CONFIG_MXC6255 +++ b/configs/fedora/generic/CONFIG_MXC6255 @@ -1 +1 @@ -# CONFIG_MXC6255 is not set +CONFIG_MXC6255=m diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a9b5d4f5e..439cf64d1 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4000,8 +4000,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 4ea8e7aa3..5e915d266 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3981,8 +3981,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 98fc6464f..e41fa0e16 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -4081,8 +4081,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index f919629bc..13573d274 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4063,8 +4063,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index d4e80dd8a..f68786326 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3981,8 +3981,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index e7bd34357..d04a888a6 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3963,8 +3963,8 @@ CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m # CONFIG_MX3_IPU is not set -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m # CONFIG_MXS_DMA is not set CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index e4530998e..554d35ade 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -3669,8 +3669,8 @@ CONFIG_MWIFIEX_USB=m # CONFIG_MWINCHIP3D is not set # CONFIG_MWINCHIPC6 is not set CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 3becfc86e..477ed4656 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3650,8 +3650,8 @@ CONFIG_MWIFIEX_USB=m # CONFIG_MWINCHIP3D is not set # CONFIG_MWINCHIPC6 is not set CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d6d3bf931..5175e03a7 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3370,8 +3370,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 3fbfcfc11..0bd80363c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3350,8 +3350,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 6ba4f8021..67d46e3b7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3341,8 +3341,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c887c0710..f95e2abff 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3321,8 +3321,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 1a2c57752..5ba528b35 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3707,8 +3707,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 96c6241f2..eb57a3a8e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3688,8 +3688,8 @@ CONFIG_MWIFIEX_PCIE=m CONFIG_MWIFIEX_SDIO=m CONFIG_MWIFIEX_USB=m CONFIG_MWL8K=m -# CONFIG_MXC4005 is not set -# CONFIG_MXC6255 is not set +CONFIG_MXC4005=m +CONFIG_MXC6255=m CONFIG_MYRI10GE_DCA=y CONFIG_MYRI10GE=m CONFIG_NAMESPACES=y diff --git a/kernel.spec b/kernel.spec index c09dbca02..43f66beea 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2998,6 +2998,9 @@ fi # # %changelog +* Thu Nov 5 11:36:02 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.6-300 +- Linux v5.9.6 + * Thu Nov 5 09:08:36 CST 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.9.5-300 - Linux v5.9.5 |