diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-23 16:24:03 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-23 16:24:03 +0100 |
| commit | bb2bdfce1e045614b033116e44ef63943aca8749 (patch) | |
| tree | de54182180a562036992f9fb62b610216dd542f4 | |
| parent | 874264f402b9c04a05e0b767918c16a3eee964e9 (diff) | |
| parent | acdeef2002369d35c9b6e723cff67cf08d7bc1b0 (diff) | |
| download | kernel-bb2bdfce1e045614b033116e44ef63943aca8749.tar.gz kernel-bb2bdfce1e045614b033116e44ef63943aca8749.tar.xz kernel-bb2bdfce1e045614b033116e44ef63943aca8749.zip | |
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
| -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 | 6 |
8 files changed, 13 insertions, 7 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 297bd3dda..3e9f2c8f0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2986,6 +2986,12 @@ fi # # %changelog +* Wed Jan 20 2021 Peter Robinson <pbrobinson@fedoraproject.org +- Fix for ARMv7 builder pause issue + +* Tue Jan 19 15:00:34 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.9-100 +- Linux v5.10.9 + * Sun Jan 17 13:09:34 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.8-100 - Linux v5.10.8 |