summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-01-24 19:18:03 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-01-24 19:18:03 +0100
commitb68cebb96ab35d8a0d5c98d4063a7166c8f12451 (patch)
tree7fb6bf23ef99c049b6cb92c8702afa1f00e9bb11
parentd871fb9418f1210057707c7c8fd3b27d544dbbbc (diff)
parent8d641c15a1062d333423ff7ee88209b988199228 (diff)
downloadkernel-b68cebb96ab35d8a0d5c98d4063a7166c8f12451.tar.gz
kernel-b68cebb96ab35d8a0d5c98d4063a7166c8f12451.tar.xz
kernel-b68cebb96ab35d8a0d5c98d4063a7166c8f12451.zip
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
-rw-r--r--kernel-aarch64-debug-fedora.config3
-rw-r--r--kernel-aarch64-fedora.config3
-rw-r--r--kernel-armv7hl-debug-fedora.config3
-rw-r--r--kernel-armv7hl-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config3
-rw-r--r--kernel-armv7hl-lpae-fedora.config3
-rw-r--r--kernel-i686-debug-fedora.config3
-rw-r--r--kernel-i686-fedora.config3
-rw-r--r--kernel-ppc64le-debug-fedora.config3
-rw-r--r--kernel-ppc64le-fedora.config3
-rw-r--r--kernel-s390x-debug-fedora.config3
-rw-r--r--kernel-s390x-fedora.config3
-rw-r--r--kernel-x86_64-debug-fedora.config3
-rw-r--r--kernel-x86_64-fedora.config3
-rw-r--r--kernel.spec4
15 files changed, 32 insertions, 14 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c97e8ee80..2d2cdf55c 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -7704,7 +7704,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 4b447e289..c9296d9e0 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -7683,7 +7683,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 533207349..de2110dc3 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -7954,7 +7954,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 804839fcd..64426686b 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -7934,7 +7934,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index bec6e4c3b..310f6fbdd 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -7694,7 +7694,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 70450f8f4..6836a0da5 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -7674,7 +7674,8 @@ CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
CONFIG_USB_XHCI_MVEBU=m
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XHCI_TEGRA=m
CONFIG_USB_XUSBATM=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 3962fd16d..422d5fc9e 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -6922,7 +6922,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 32a274690..712bd8a70 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -6901,7 +6901,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c654233f4..99c8dd9df 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -6496,7 +6496,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index ee9b1a861..419047042 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -6474,7 +6474,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 5b1b2fbee..2042a7c8f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -6432,7 +6432,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 9b925585d..1d5d912df 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -6410,7 +6410,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
# CONFIG_USB_XHCI_PLATFORM is not set
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index bceabd92e..48dd0ee7f 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6977,7 +6977,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index ae0653aa6..0707ea8e8 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -6956,7 +6956,8 @@ CONFIG_USB_WDM=m
CONFIG_USB_XHCI_DBGCAP=y
CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_HISTB is not set
-CONFIG_USB_XHCI_PCI_RENESAS=m
+CONFIG_USB_XHCI_PCI_RENESAS=y
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
CONFIG_USB_XUSBATM=m
CONFIG_USB=y
diff --git a/kernel.spec b/kernel.spec
index 7c53c0e88..d402eda55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2986,6 +2986,10 @@ fi
#
#
%changelog
+* Sun Jan 24 11:29:01 CST 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.10-100
+- Linux v5.10.10
+- Fixes CVE-2021-3178 (rhbz 1918179 1918181)
+
* Wed Jan 20 2021 Peter Robinson <pbrobinson@fedoraproject.org
- Fix for ARMv7 builder pause issue