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-fedora.config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel-s390x-fedora.config') diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 36aaf65f3..940acbe52 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -853,6 +853,8 @@ CONFIG_CMA_AREAS=7 # 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 @@ -1399,7 +1401,6 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m # CONFIG_DRM_PANEL_TPO_TPG110 is not set # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set CONFIG_DRM_PANEL_VISIONOX_RM69299=m -# CONFIG_DRM_PANEL_XINGBANGDA_XBD599 is not set # CONFIG_DRM_PANEL_XINPENG_XPP055C272 is not set CONFIG_DRM_PANEL=y # CONFIG_DRM_PARADE_PS8622 is not set -- cgit