summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-rhel.config
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-04 11:55:23 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-04 11:55:23 -0600
commit8072928de6ed1332e9515396ad441d57dde10378 (patch)
tree6cc895a609026d045896289f1090d9b21944602b /kernel-s390x-rhel.config
parent51aea159355a5cbfab3df1ad553d6a45728c77f0 (diff)
downloadkernel-8072928de6ed1332e9515396ad441d57dde10378.tar.gz
kernel-8072928de6ed1332e9515396ad441d57dde10378.tar.xz
kernel-8072928de6ed1332e9515396ad441d57dde10378.zip
kernel-5.12.0-0.rc1.20210304gitf69d02e37a85.163
* Thu Mar 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc1.20210304gitf69d02e37a85.163] - Revert "dt-bindings: panel: add binding for Xingbangda XBD599 panel" (Herton R. Krzesinski) - redhat: remove CONFIG_DRM_PANEL_XINGBANGDA_XBD599 (Herton R. Krzesinski) - Revert "drm: panel: add Xingbangda XBD599 panel" (Herton R. Krzesinski) - Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation" (Herton R. Krzesinski) - New configs in arch/powerpc (Fedora Kernel Team) - Fix merge issue (Justin M. Forbes) - Revert pending so that MR works (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r--kernel-s390x-rhel.config4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 7503afd44..d6d21aafc 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -689,7 +689,8 @@ CONFIG_CMA_AREAS=7
# CONFIG_CMA_DEBUGFS is not set
# CONFIG_CMA_DEBUG is not set
CONFIG_CMA=y
-CONFIG_CMDLINE=""
+# CONFIG_CMDLINE_EXTEND is not set
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
# CONFIG_CMDLINE_PARTITION is not set
CONFIG_CMM_IUCV=y
CONFIG_CMM=m
@@ -1210,7 +1211,6 @@ CONFIG_DRM_NOUVEAU_BACKLIGHT=y
# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
# CONFIG_DRM_PANEL_TPO_TPG110 is not set
-# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set
# CONFIG_DRM_PANFROST is not set
# CONFIG_DRM_PARADE_PS8622 is not set
# CONFIG_DRM_PARADE_PS8640 is not set