summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-05-30 11:34:42 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-05-30 11:34:42 -0500
commit815bdcd40d3af5495d19e81091f592d96f482a63 (patch)
tree3740c20ef61c09954561c404fbb48e4670dd7884
parentdc561b7c300d18acdd8ced4236c70c3baa2d24d6 (diff)
downloadkernel-815bdcd40d3af5495d19e81091f592d96f482a63.tar.gz
kernel-815bdcd40d3af5495d19e81091f592d96f482a63.tar.xz
kernel-815bdcd40d3af5495d19e81091f592d96f482a63.zip
kernel-5.17.12-0
* Mon May 30 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.12-0] - Revert "crypto: rng - Override drivers/char/random in FIPS mode" (Justin M. Forbes) - Revert "random: Add hook to override device reads and getrandom(2)" (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Patchlist.changelog6
-rw-r--r--kernel-aarch64-debug-fedora.config15
-rw-r--r--kernel-aarch64-fedora.config15
-rw-r--r--kernel-armv7hl-debug-fedora.config15
-rw-r--r--kernel-armv7hl-fedora.config15
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config15
-rw-r--r--kernel-armv7hl-lpae-fedora.config15
-rw-r--r--kernel-ppc64le-debug-fedora.config13
-rw-r--r--kernel-ppc64le-fedora.config13
-rw-r--r--kernel-s390x-debug-fedora.config13
-rw-r--r--kernel-s390x-fedora.config13
-rw-r--r--kernel-x86_64-debug-fedora.config15
-rw-r--r--kernel-x86_64-fedora.config15
-rwxr-xr-xkernel.spec12
-rw-r--r--patch-5.17-redhat.patch312
-rw-r--r--sources6
16 files changed, 99 insertions, 409 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 2d1781fbe..66a6bbdb1 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,9 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/77da23276919a734b100b4856457d1b4c856e758
+ 77da23276919a734b100b4856457d1b4c856e758 Revert "crypto: rng - Override drivers/char/random in FIPS mode"
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/41f81f1faeab51ba2fe611184467ca22379d50e5
+ 41f81f1faeab51ba2fe611184467ca22379d50e5 Revert "random: Add hook to override device reads and getrandom(2)"
+
"https://gitlab.com/cki-project/kernel-ark/-/commit"/205bec68a0ea67b6bff6fea9603b7b8aeacc9d46
205bec68a0ea67b6bff6fea9603b7b8aeacc9d46 drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index c97c72be3..7c0090883 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1692,7 +1692,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1730,6 +1729,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MESON_DW_HDMI=m
@@ -1840,7 +1840,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_SUN4I_BACKEND=m
CONFIG_DRM_SUN4I_HDMI_CEC=y
CONFIG_DRM_SUN4I_HDMI=m
@@ -1874,7 +1874,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2135,7 +2134,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2161,13 +2160,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2656,7 +2655,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7402,7 +7401,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_SYSTEM76_ACPI is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e3f5768dd..48ef2c6fe 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1684,7 +1684,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1722,6 +1721,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
CONFIG_DRM_LONTIUM_LT9611=m
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MESON_DW_HDMI=m
@@ -1832,7 +1832,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_SUN4I_BACKEND=m
CONFIG_DRM_SUN4I_HDMI_CEC=y
CONFIG_DRM_SUN4I_HDMI=m
@@ -1866,7 +1866,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2119,7 +2118,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2145,13 +2144,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2640,7 +2639,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7375,7 +7374,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_SYSTEM76_ACPI is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 709795bf2..1fb8ae257 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1691,7 +1691,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1748,6 +1747,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MCDE is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1860,7 +1860,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_STI=m
CONFIG_DRM_STM_DSI=m
CONFIG_DRM_STM=m
@@ -1899,7 +1899,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2170,7 +2169,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2196,13 +2195,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2674,7 +2673,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7571,7 +7570,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index f10d9f801..d81307186 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1684,7 +1684,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1741,6 +1740,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MCDE is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1853,7 +1853,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_STI=m
CONFIG_DRM_STM_DSI=m
CONFIG_DRM_STM=m
@@ -1892,7 +1892,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2155,7 +2154,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2181,13 +2180,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2659,7 +2658,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7545,7 +7544,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 4d8c4a90c..8117c6a0f 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1660,7 +1660,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1713,6 +1712,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MCDE is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1817,7 +1817,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_STI=m
CONFIG_DRM_STM_DSI=m
CONFIG_DRM_STM=m
@@ -1856,7 +1856,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2124,7 +2123,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2150,13 +2149,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2620,7 +2619,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7339,7 +7338,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 7cba7f248..55a74d00d 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1653,7 +1653,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1706,6 +1705,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
CONFIG_DRM_MALI_DISPLAY=m
# CONFIG_DRM_MCDE is not set
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
@@ -1810,7 +1810,7 @@ CONFIG_DRM_ROCKCHIP=m
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
CONFIG_DRM_STI=m
CONFIG_DRM_STM_DSI=m
CONFIG_DRM_STM=m
@@ -1849,7 +1849,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
CONFIG_DRM_ZYNQMP_DPSUB=m
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
@@ -2109,7 +2108,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -2135,13 +2134,13 @@ CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_S3 is not set
# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIMPLE is not set
+CONFIG_FB_SIMPLE=y
# CONFIG_FB_SIS is not set
# CONFIG_FB_SM501 is not set
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2605,7 +2604,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -7313,7 +7312,7 @@ CONFIG_SYNTH_EVENTS=y
CONFIG_SYSCON_REBOOT_MODE=y
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 6fe0131c3..81abf9f04 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1319,7 +1319,6 @@ CONFIG_DRM_BOCHS=m
CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1346,6 +1345,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MXSFB is not set
@@ -1439,7 +1439,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1460,7 +1460,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1695,7 +1694,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -1727,7 +1726,7 @@ CONFIG_FB_OF=y
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2169,7 +2168,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -6305,7 +6304,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 1e244f858..266ddb132 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1310,7 +1310,6 @@ CONFIG_DRM_BOCHS=m
CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1337,6 +1336,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MXSFB is not set
@@ -1430,7 +1430,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1451,7 +1451,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1678,7 +1677,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -1710,7 +1709,7 @@ CONFIG_FB_OF=y
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2152,7 +2151,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -6278,7 +6277,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 84e523a25..f2c567ab7 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1327,7 +1327,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1354,6 +1353,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_MXSFB is not set
@@ -1447,7 +1447,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1468,7 +1468,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1703,7 +1702,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -1734,7 +1733,7 @@ CONFIG_FAULT_INJECTION=y
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2152,7 +2151,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -6247,7 +6246,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0c6d1f911..2a1c35875 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1318,7 +1318,6 @@ CONFIG_DRM_ANALOGIX_ANX78XX=m
CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
# CONFIG_DRM_CIRRUS_QEMU is not set
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1345,6 +1344,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
# CONFIG_DRM_MGAG200 is not set
# CONFIG_DRM_MXSFB is not set
@@ -1438,7 +1438,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1459,7 +1459,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_MKSSTATS is not set
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1686,7 +1685,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_CARMINE is not set
# CONFIG_FB_CIRRUS is not set
# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_EFI is not set
+CONFIG_FB_EFI=y
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
@@ -1717,7 +1716,7 @@ CONFIG_FAT_KUNIT_TEST=m
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -2135,7 +2134,7 @@ CONFIG_HZ_100=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -6220,7 +6219,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index b62de1508..7ac19bd4d 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1434,7 +1434,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1470,6 +1469,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MXSFB is not set
@@ -1563,7 +1563,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1584,7 +1584,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
CONFIG_DRM_VMWGFX_MKSSTATS=y
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1863,7 +1862,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
+CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
@@ -1893,7 +1892,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -1901,7 +1900,7 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VGA16=m
# CONFIG_FB_VIA is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VOODOO1 is not set
@@ -2347,7 +2346,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -6686,7 +6685,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_SYSTEM76_ACPI=m
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 685d31c32..5d6a99305 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1425,7 +1425,6 @@ CONFIG_DRM_CHIPONE_ICN6211=m
CONFIG_DRM_CHRONTEL_CH7033=m
CONFIG_DRM_CIRRUS_QEMU=m
CONFIG_DRM_CROS_EC_ANX7688=m
-# CONFIG_DRM_DEBUG_MM is not set
# CONFIG_DRM_DEBUG_SELFTEST is not set
CONFIG_DRM_DISPLAY_CONNECTOR=m
CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1461,6 +1460,7 @@ CONFIG_DRM_LONTIUM_LT8912B=m
# CONFIG_DRM_LONTIUM_LT9611 is not set
CONFIG_DRM_LONTIUM_LT9611UXC=m
# CONFIG_DRM_LVDS_CODEC is not set
+CONFIG_DRM=m
# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
CONFIG_DRM_MGAG200=m
# CONFIG_DRM_MXSFB is not set
@@ -1554,7 +1554,7 @@ CONFIG_DRM_RADEON_USERPTR=y
CONFIG_DRM_SII9234=m
# CONFIG_DRM_SIL_SII8620 is not set
CONFIG_DRM_SIMPLE_BRIDGE=m
-CONFIG_DRM_SIMPLEDRM=y
+# CONFIG_DRM_SIMPLEDRM is not set
# CONFIG_DRM_THINE_THC63LVD1024 is not set
CONFIG_DRM_TIDSS=m
# CONFIG_DRM_TI_SN65DSI83 is not set
@@ -1575,7 +1575,6 @@ CONFIG_DRM_VMWGFX_FBCON=y
CONFIG_DRM_VMWGFX=m
CONFIG_DRM_VMWGFX_MKSSTATS=y
# CONFIG_DRM_XEN_FRONTEND is not set
-CONFIG_DRM=y
# CONFIG_DS1682 is not set
# CONFIG_DS1803 is not set
# CONFIG_DS4424 is not set
@@ -1846,7 +1845,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_HGA is not set
# CONFIG_FB_HYPERV is not set
# CONFIG_FB_I740 is not set
-# CONFIG_FB_I810 is not set
+CONFIG_FB_I810=m
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_KYRO is not set
@@ -1876,7 +1875,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_SM712 is not set
# CONFIG_FB_SM750 is not set
# CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SSD1307 is not set
+CONFIG_FB_SSD1307=m
# CONFIG_FB_TFT is not set
CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_TMIO is not set
@@ -1884,7 +1883,7 @@ CONFIG_FB_TILEBLITTING=y
# CONFIG_FB_UDL is not set
# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
-# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VGA16=m
# CONFIG_FB_VIA is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_VOODOO1 is not set
@@ -2330,7 +2329,7 @@ CONFIG_HZ_1000=y
# CONFIG_HZ_300 is not set
# CONFIG_HZ_500 is not set
# CONFIG_HZ_PERIODIC is not set
-CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_ALGOPCA=m
CONFIG_I2C_ALGOPCF=m
# CONFIG_I2C_ALI1535 is not set
@@ -6660,7 +6659,7 @@ CONFIG_SYNTH_EVENTS=y
# CONFIG_SYSCON_REBOOT_MODE is not set
CONFIG_SYSCTL_KUNIT_TEST=m
CONFIG_SYSCTL=y
-CONFIG_SYSFB_SIMPLEFB=y
+# CONFIG_SYSFB_SIMPLEFB is not set
# CONFIG_SYSFS_DEPRECATED is not set
CONFIG_SYSTEM76_ACPI=m
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
diff --git a/kernel.spec b/kernel.spec
index 7f44c3f9d..af5e30917 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -130,7 +130,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.17
-%define rpmversion 5.17.11
+%define rpmversion 5.17.12
%define patchversion 5.17
%define pkgrelease 200
@@ -695,7 +695,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17.11.tar.xz
+Source0: linux-5.17.12.tar.xz
Source1: Makefile.rhelver
@@ -1387,8 +1387,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17.11 -c
-mv linux-5.17.11 linux-%{KVERREL}
+%setup -q -n kernel-5.17.12 -c
+mv linux-5.17.12 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -3015,6 +3015,10 @@ fi
#
#
%changelog
+* Mon May 30 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.12-0]
+- Revert "crypto: rng - Override drivers/char/random in FIPS mode" (Justin M. Forbes)
+- Revert "random: Add hook to override device reads and getrandom(2)" (Justin M. Forbes)
+
* Wed May 25 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17.11-0]
- Linux v5.17.11 (Justin M. Forbes)
diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch
index 187a9f9e3..358dea787 100644
--- a/patch-5.17-redhat.patch
+++ b/patch-5.17-redhat.patch
@@ -10,14 +10,12 @@
arch/x86/boot/header.S | 4 +
arch/x86/include/asm/efi.h | 5 +
arch/x86/kernel/setup.c | 22 ++--
- crypto/rng.c | 73 +++++++++++-
drivers/acpi/apei/hest.c | 8 ++
drivers/acpi/irq.c | 17 ++-
drivers/acpi/scan.c | 9 ++
drivers/ata/libahci.c | 18 +++
drivers/char/ipmi/ipmi_dmi.c | 15 +++
drivers/char/ipmi/ipmi_msghandler.c | 16 ++-
- drivers/char/random.c | 115 +++++++++++++++++++
drivers/firmware/efi/Kconfig | 12 ++
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi.c | 124 +++++++++++++++------
@@ -46,7 +44,6 @@
include/linux/lsm_hooks.h | 6 +
include/linux/module.h | 1 +
include/linux/nfs_fs_sb.h | 1 +
- include/linux/random.h | 7 ++
include/linux/rmi.h | 1 +
include/linux/security.h | 5 +
init/Kconfig | 2 +-
@@ -60,7 +57,7 @@
security/lockdown/Kconfig | 13 +++
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 62 files changed, 997 insertions(+), 213 deletions(-)
+ 59 files changed, 803 insertions(+), 212 deletions(-)
diff --git a/Documentation/core-api/dma-attributes.rst b/Documentation/core-api/dma-attributes.rst
index 1887d92e8e92..17706dc91ec9 100644
@@ -112,7 +109,7 @@ index 000000000000..733a26bd887a
+
+endmenu
diff --git a/Makefile b/Makefile
-index b821f270a4ca..72a7c6958ea5 100644
+index 25c44dda0ef3..5af0d61c0782 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -304,103 +301,6 @@ index 90d7e1788c91..262198c48162 100644
reserve_initrd();
-diff --git a/crypto/rng.c b/crypto/rng.c
-index fea082b25fe4..50a9d040bed1 100644
---- a/crypto/rng.c
-+++ b/crypto/rng.c
-@@ -11,14 +11,17 @@
- #include <linux/atomic.h>
- #include <crypto/internal/rng.h>
- #include <linux/err.h>
-+#include <linux/fips.h>
-+#include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/mutex.h>
- #include <linux/random.h>
- #include <linux/seq_file.h>
-+#include <linux/sched.h>
-+#include <linux/sched/signal.h>
- #include <linux/slab.h>
- #include <linux/string.h>
- #include <linux/cryptouser.h>
--#include <linux/compiler.h>
- #include <net/netlink.h>
-
- #include "internal.h"
-@@ -224,5 +227,73 @@ void crypto_unregister_rngs(struct rng_alg *algs, int count)
- }
- EXPORT_SYMBOL_GPL(crypto_unregister_rngs);
-
-+static ssize_t crypto_devrandom_read(void __user *buf, size_t buflen)
-+{
-+ u8 tmp[256];
-+ ssize_t ret;
-+
-+ if (!buflen)
-+ return 0;
-+
-+ ret = crypto_get_default_rng();
-+ if (ret)
-+ return ret;
-+
-+ for (;;) {
-+ int err;
-+ int i;
-+
-+ i = min_t(int, buflen, sizeof(tmp));
-+ err = crypto_rng_get_bytes(crypto_default_rng, tmp, i);
-+ if (err) {
-+ ret = err;
-+ break;
-+ }
-+
-+ if (copy_to_user(buf, tmp, i)) {
-+ ret = -EFAULT;
-+ break;
-+ }
-+
-+ buflen -= i;
-+ buf += i;
-+ ret += i;
-+
-+ if (!buflen)
-+ break;
-+
-+ if (need_resched()) {
-+ if (signal_pending(current))
-+ break;
-+ schedule();
-+ }
-+ }
-+
-+ crypto_put_default_rng();
-+ memzero_explicit(tmp, sizeof(tmp));
-+
-+ return ret;
-+}
-+
-+static const struct random_extrng crypto_devrandom_rng = {
-+ .extrng_read = crypto_devrandom_read,
-+ .owner = THIS_MODULE,
-+};
-+
-+static int __init crypto_rng_init(void)
-+{
-+ if (fips_enabled)
-+ random_register_extrng(&crypto_devrandom_rng);
-+ return 0;
-+}
-+
-+static void __exit crypto_rng_exit(void)
-+{
-+ random_unregister_extrng();
-+}
-+
-+late_initcall(crypto_rng_init);
-+module_exit(crypto_rng_exit);
-+
- MODULE_LICENSE("GPL");
- MODULE_DESCRIPTION("Random Number Generator");
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 6aef1ee5e1bd..8f146b1b4972 100644
--- a/drivers/acpi/apei/hest.c
@@ -573,189 +473,6 @@ index f1827257ef0e..5a45c2cd3dc2 100644
mutex_lock(&ipmi_interfaces_mutex);
rv = ipmi_register_driver();
mutex_unlock(&ipmi_interfaces_mutex);
-diff --git a/drivers/char/random.c b/drivers/char/random.c
-index 3404a91edf29..184dbb94710c 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -344,6 +344,7 @@
- #include <linux/syscalls.h>
- #include <linux/completion.h>
- #include <linux/uuid.h>
-+#include <linux/rcupdate.h>
- #include <crypto/chacha.h>
- #include <crypto/blake2s.h>
-
-@@ -358,6 +359,11 @@
-
- /* #define ADD_INTERRUPT_BENCH */
-
-+/*
-+ * Hook for external RNG.
-+ */
-+static const struct random_extrng __rcu *extrng;
-+
- /*
- * If the entropy count falls under this number of bits, then we
- * should wake up processes which are selecting or polling on write
-@@ -486,6 +492,9 @@ static int ratelimit_disable __read_mostly;
- module_param_named(ratelimit_disable, ratelimit_disable, int, 0644);
- MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression");
-
-+static const struct file_operations extrng_random_fops;
-+static const struct file_operations extrng_urandom_fops;
-+
- /**********************************************************************
- *
- * OS independent entropy store. Here are the functions which handle
-@@ -1775,6 +1784,13 @@ static __poll_t random_poll(struct file *file, poll_table *wait)
- return mask;
- }
-
-+static __poll_t
-+extrng_poll(struct file *file, poll_table * wait)
-+{
-+ /* extrng pool is always full, always read, no writes */
-+ return EPOLLIN | EPOLLRDNORM;
-+}
-+
- static int write_pool(const char __user *buffer, size_t count)
- {
- size_t bytes;
-@@ -1879,7 +1895,58 @@ static int random_fasync(int fd, struct file *filp, int on)
- return fasync_helper(fd, filp, on, &fasync);
- }
-
-+static int random_open(struct inode *inode, struct file *filp)
-+{
-+ const struct random_extrng *rng;
-+
-+ rcu_read_lock();
-+ rng = rcu_dereference(extrng);
-+ if (rng && !try_module_get(rng->owner))
-+ rng = NULL;
-+ rcu_read_unlock();
-+
-+ if (!rng)
-+ return 0;
-+
-+ filp->f_op = &extrng_random_fops;
-+ filp->private_data = rng->owner;
-+
-+ return 0;
-+}
-+
-+static int urandom_open(struct inode *inode, struct file *filp)
-+{
-+ const struct random_extrng *rng;
-+
-+ rcu_read_lock();
-+ rng = rcu_dereference(extrng);
-+ if (rng && !try_module_get(rng->owner))
-+ rng = NULL;
-+ rcu_read_unlock();
-+
-+ if (!rng)
-+ return 0;
-+
-+ filp->f_op = &extrng_urandom_fops;
-+ filp->private_data = rng->owner;
-+
-+ return 0;
-+}
-+
-+static int extrng_release(struct inode *inode, struct file *filp)
-+{
-+ module_put(filp->private_data);
-+ return 0;
-+}
-+
-+static ssize_t
-+extrng_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
-+{
-+ return rcu_dereference_raw(extrng)->extrng_read(buf, nbytes);
-+}
-+
- const struct file_operations random_fops = {
-+ .open = random_open,
- .read = random_read,
- .write = random_write,
- .poll = random_poll,
-@@ -1890,6 +1957,7 @@ const struct file_operations random_fops = {
- };
-
- const struct file_operations urandom_fops = {
-+ .open = urandom_open,
- .read = urandom_read,
- .write = random_write,
- .unlocked_ioctl = random_ioctl,
-@@ -1898,9 +1966,31 @@ const struct file_operations urandom_fops = {
- .llseek = noop_llseek,
- };
-
-+static const struct file_operations extrng_random_fops = {
-+ .open = random_open,
-+ .read = extrng_read,
-+ .write = random_write,
-+ .poll = extrng_poll,
-+ .unlocked_ioctl = random_ioctl,
-+ .fasync = random_fasync,
-+ .llseek = noop_llseek,
-+ .release = extrng_release,
-+};
-+
-+static const struct file_operations extrng_urandom_fops = {
-+ .open = urandom_open,
-+ .read = extrng_read,
-+ .write = random_write,
-+ .unlocked_ioctl = random_ioctl,
-+ .fasync = random_fasync,
-+ .llseek = noop_llseek,
-+ .release = extrng_release,
-+};
-+
- SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int,
- flags)
- {
-+ const struct random_extrng *rng;
- int ret;
-
- if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE))
-@@ -1916,6 +2006,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int,
- if (count > INT_MAX)
- count = INT_MAX;
-
-+ rcu_read_lock();
-+ rng = rcu_dereference(extrng);
-+ if (rng && !try_module_get(rng->owner))
-+ rng = NULL;
-+ rcu_read_unlock();
-+
-+ if (rng) {
-+ ret = rng->extrng_read(buf, count);
-+ module_put(rng->owner);
-+ return ret;
-+ }
-+
- if (!(flags & GRND_INSECURE) && !crng_ready()) {
- if (flags & GRND_NONBLOCK)
- return -EAGAIN;
-@@ -2235,3 +2337,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size)
- add_device_randomness(buf, size);
- }
- EXPORT_SYMBOL_GPL(add_bootloader_randomness);
-+
-+void random_register_extrng(const struct random_extrng *rng)
-+{
-+ rcu_assign_pointer(extrng, rng);
-+}
-+EXPORT_SYMBOL_GPL(random_register_extrng);
-+
-+void random_unregister_extrng(void)
-+{
-+ RCU_INIT_POINTER(extrng, NULL);
-+ synchronize_rcu();
-+}
-+EXPORT_SYMBOL_GPL(random_unregister_extrng);
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 2c3dac5ecb36..f44f8b746e42 100644
--- a/drivers/firmware/efi/Kconfig
@@ -2143,31 +1860,6 @@ index ca0959e51e81..b0e3fd550122 100644
unsigned int fattr_valid; /* Valid attributes */
unsigned int caps; /* server capabilities */
-diff --git a/include/linux/random.h b/include/linux/random.h
-index c45b2693e51f..4edfdb3e44a9 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -14,6 +14,11 @@
-
- #include <uapi/linux/random.h>
-
-+struct random_extrng {
-+ ssize_t (*extrng_read)(void __user *buf, size_t buflen);
-+ struct module *owner;
-+};
-+
- struct random_ready_callback {
- struct list_head list;
- void (*func)(struct random_ready_callback *rdy);
-@@ -44,6 +49,8 @@ extern bool rng_is_initialized(void);
- extern int add_random_ready_callback(struct random_ready_callback *rdy);
- extern void del_random_ready_callback(struct random_ready_callback *rdy);
- extern int __must_check get_random_bytes_arch(void *buf, int nbytes);
-+void random_register_extrng(const struct random_extrng *rng);
-+void random_unregister_extrng(void);
-
- #ifndef MODULE
- extern const struct file_operations random_fops, urandom_fops;
diff --git a/include/linux/rmi.h b/include/linux/rmi.h
index ab7eea01ab42..fff7c5f737fc 100644
--- a/include/linux/rmi.h
diff --git a/sources b/sources
index 6b01250e3..684102195 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17.11.tar.xz) = 6a2a02537326b8425ca90ab3f3e23b5551956c400a15818eeaac77701e83ddd31629d44875887332fb4ac05fc2dbd0a0a964291f90efa428012f0f7d682e694a
-SHA512 (kernel-abi-stablelists-5.17.11-200.tar.bz2) = b9ca2c4d2f08cf536aee6e3b7a4656da657f165fe6343903adc8d99cec474a082ce42359f77223db3eece4151e743bef6e38effd580969d619c4137bf8fea286
-SHA512 (kernel-kabi-dw-5.17.11-200.tar.bz2) = a151ebd022193373624fb17d9e67ab6319bc20aba15e94e44cf1ae87e071eeee1f2baf9afa9a71722c1ceebe420ad65f57f480d0bd441c93926f87b09beeeedd
+SHA512 (linux-5.17.12.tar.xz) = bdf54320810a1ed1b303b89730aec2fa0e68e45b96c813a15f5cca60e6ce765c0b1a3d4fd39317765227429f206172c709df17741138c6b3e7cbc73ca98cb61d
+SHA512 (kernel-abi-stablelists-5.17.12-200.tar.bz2) = 378bb77e2b5d814751979086eb24e4d692c5e7f3875210ddde2d6418b745f8ef25c9fd4b97daedfc05d8c816b9d16da2a062453a4ab0d4b8c8659a70c0b18d6b
+SHA512 (kernel-kabi-dw-5.17.12-200.tar.bz2) = 92d19a7604057d7c6997250dd0313b8a8d0b1d664dc99d022e4e8230d84cd1157ef954ff3cea4e9c3f98c2ab54126b48b12d6a92c36d6188223366ef431b55f0