diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-23 16:23:28 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-23 16:23:28 +0100 |
commit | 1e5dc0825c45d783c4aa17b575f42675e0284bf1 (patch) | |
tree | 1cfce941cfef83258abf66b302e66db86cbed30f | |
parent | 022768c73de09e8960a22684773d909b4e88b7c8 (diff) | |
parent | c48d79f758c7d59672d72f68d3f24b3d31719a33 (diff) | |
download | kernel-1e5dc0825c45d783c4aa17b575f42675e0284bf1.tar.gz kernel-1e5dc0825c45d783c4aa17b575f42675e0284bf1.tar.xz kernel-1e5dc0825c45d783c4aa17b575f42675e0284bf1.zip |
merge origin
-rw-r--r-- | configs/fedora/generic/CONFIG_USB_XHCI_PCI | 1 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_USB_XHCI_PCI_RENESAS | 2 | ||||
-rw-r--r-- | configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE | 3 | ||||
-rw-r--r-- | kernel-armv7hl-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug-fedora.config | 2 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-fedora.config | 2 | ||||
-rw-r--r-- | kernel.spec | 8 |
8 files changed, 14 insertions, 8 deletions
diff --git a/configs/fedora/generic/CONFIG_USB_XHCI_PCI b/configs/fedora/generic/CONFIG_USB_XHCI_PCI new file mode 100644 index 000000000..69eea98da --- /dev/null +++ b/configs/fedora/generic/CONFIG_USB_XHCI_PCI @@ -0,0 +1 @@ +CONFIG_USB_XHCI_PCI=y diff --git a/configs/fedora/generic/CONFIG_USB_XHCI_PCI_RENESAS b/configs/fedora/generic/CONFIG_USB_XHCI_PCI_RENESAS index 7ce730173..05b2b8562 100644 --- a/configs/fedora/generic/CONFIG_USB_XHCI_PCI_RENESAS +++ b/configs/fedora/generic/CONFIG_USB_XHCI_PCI_RENESAS @@ -1 +1 @@ -CONFIG_USB_XHCI_PCI_RENESAS=m +CONFIG_USB_XHCI_PCI_RENESAS=y diff --git a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE index 4f5e59821..cd440ed6d 100644 --- a/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE +++ b/configs/fedora/generic/arm/armv7/CONFIG_HIGHPTE @@ -1,2 +1 @@ -# TODO fix due to hardware errata -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index acee275ee..533207349 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2501,7 +2501,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 15089b8b7..804839fcd 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2486,7 +2486,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index a21f92ca3..bec6e4c3b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2447,7 +2447,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index bf2f30383..70450f8f4 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2432,7 +2432,7 @@ CONFIG_HID=y CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y +# CONFIG_HIGHPTE is not set CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set # CONFIG_HISI_DMA is not set diff --git a/kernel.spec b/kernel.spec index 46eb26bdb..eb817c880 100644 --- a/kernel.spec +++ b/kernel.spec @@ -84,7 +84,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 350 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2986,6 +2986,12 @@ fi # # %changelog +* Wed Jan 20 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 5.10.9-201 +- Fix for ARMv7 builder pause issue + +* Tue Jan 19 15:00:17 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.9-200 +- Linux v5.10.9 + * Sun Jan 17 13:09:31 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.8-200 - Linux v5.10.8 |