From 8072928de6ed1332e9515396ad441d57dde10378 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 4 Mar 2021 11:55:23 -0600 Subject: kernel-5.12.0-0.rc1.20210304gitf69d02e37a85.163 * Thu Mar 04 2021 Fedora Kernel Team [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 --- kernel-s390x-rhel.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel-s390x-rhel.config') 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 -- cgit