Linux v5.1-rc1

26 files changed, 59 insertions, 62 deletions

diff --git a/configs/fedora/generic/CONFIG_DEV_DAX_KMEM b/configs/fedora/generic/CONFIG_DEV_DAX_KMEM
new file mode 100644
index 000000000..755061fbf
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DEV_DAX_KMEM
@@ -0,0 +1 @@
+# CONFIG_DEV_DAX_KMEM is not set
diff --git a/configs/fedora/generic/CONFIG_DEV_DAX_PMEM_COMPAT b/configs/fedora/generic/CONFIG_DEV_DAX_PMEM_COMPAT
new file mode 100644
index 000000000..944831fd5
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DEV_DAX_PMEM_COMPAT
@@ -0,0 +1 @@
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
diff --git a/configs/fedora/generic/CONFIG_DRM_ETNAVIV b/configs/fedora/generic/CONFIG_DRM_ETNAVIV
new file mode 100644
index 000000000..e9f67ce86
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_DRM_ETNAVIV
@@ -0,0 +1 @@
+# CONFIG_DRM_ETNAVIV is not set
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV b/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV
new file mode 100644
index 000000000..699299fab
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV
@@ -0,0 +1 @@
+CONFIG_DRM_ETNAVIV=m
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV_THERMAL b/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV_THERMAL
new file mode 100644
index 000000000..ddd9d5832
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DRM_ETNAVIV_THERMAL
@@ -0,0 +1 @@
+CONFIG_DRM_ETNAVIV_THERMAL=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DEV_DAX_KMEM b/configs/fedora/generic/arm/aarch64/CONFIG_DEV_DAX_KMEM
new file mode 100644
index 000000000..e301a496b
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_DEV_DAX_KMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_KMEM=m
diff --git a/configs/fedora/generic/powerpc/CONFIG_DEV_DAX_KMEM b/configs/fedora/generic/powerpc/CONFIG_DEV_DAX_KMEM
new file mode 100644
index 000000000..e301a496b
--- /dev/null
+++ b/configs/fedora/generic/powerpc/CONFIG_DEV_DAX_KMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_KMEM=m
diff --git a/configs/fedora/generic/s390x/CONFIG_DEV_DAX_KMEM b/configs/fedora/generic/s390x/CONFIG_DEV_DAX_KMEM
new file mode 100644
index 000000000..e301a496b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DEV_DAX_KMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_KMEM=m
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_DEV_DAX_KMEM b/configs/fedora/generic/x86/x86_64/CONFIG_DEV_DAX_KMEM
new file mode 100644
index 000000000..e301a496b
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_DEV_DAX_KMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_KMEM=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3f19b8931..1746eae95 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1297,6 +1297,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEV_APPLETALK is not set
+CONFIG_DEV_DAX_KMEM=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
 CONFIG_DEVFREQ_GOV_PASSIVE=m
 CONFIG_DEVFREQ_GOV_PERFORMANCE=m
@@ -1397,6 +1399,8 @@ CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_MIPI_DSI=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0ea69d99f..6c9684769 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1290,6 +1290,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_DEV_APPLETALK is not set
+CONFIG_DEV_DAX_KMEM=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
 CONFIG_DEVFREQ_GOV_PASSIVE=m
 CONFIG_DEVFREQ_GOV_PERFORMANCE=m
@@ -1389,6 +1391,8 @@ CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_MIPI_DSI=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 8a4baf64a..51ec4d1f8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1301,6 +1301,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEV_APPLETALK is not set
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 1fe247793..33c2d4d29 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1257,6 +1257,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEV_APPLETALK is not set
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
@@ -1361,6 +1363,8 @@ CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_MIPI_DSI=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_EXYNOS5433_DECON=y
 CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_DPI=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 820625a24..783532a9a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1250,6 +1250,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_DEV_APPLETALK is not set
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
@@ -1354,6 +1356,8 @@ CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
 CONFIG_DRM_DW_MIPI_DSI=m
+CONFIG_DRM_ETNAVIV=m
+CONFIG_DRM_ETNAVIV_THERMAL=y
 CONFIG_DRM_EXYNOS5433_DECON=y
 CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_DPI=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4158b0a8d..0bd7d82b9 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1294,6 +1294,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_DEV_APPLETALK is not set
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
 CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index a1b673d19..beaf55e2b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1104,6 +1104,8 @@ CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1194,6 +1196,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 77c80f37a..7c2ead4ff 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1096,6 +1096,8 @@ CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+# CONFIG_DEV_DAX_KMEM is not set
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1185,6 +1187,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 52ac33d5a..ed796c797 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1015,7 +1015,9 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
@@ -1103,6 +1105,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 24d48fb77..a921ba2f3 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1007,7 +1007,9 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
@@ -1094,6 +1096,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e97493186..46c72feb6 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1023,6 +1023,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1110,6 +1112,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4b6244143..d1727fbe6 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1015,6 +1015,8 @@ CONFIG_DEFAULT_SECURITY_SELINUX=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -1101,6 +1103,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e39b34125..2bf7fb1fd 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1144,7 +1144,9 @@ CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
@@ -1238,6 +1240,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 02be7e6b1..f538fa6f8 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1136,7 +1136,9 @@ CONFIG_DELL_WMI_LED=m
 CONFIG_DELL_WMI=m
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_DEV_DAX=m
+# CONFIG_DEV_DAX_PMEM_COMPAT is not set
 CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
@@ -1229,6 +1231,7 @@ CONFIG_DRM_DP_CEC=y
 # CONFIG_DRM_DUMB_VGA_DAC is not set
 # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set
 # CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set
+# CONFIG_DRM_ETNAVIV is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GMA3600=y
diff --git a/kernel.spec b/kernel.spec
index 49ba9b1d7..2df21ff66 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 0
+%global rcrev 1
 # The git snapshot level
-%define gitrev 9
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -511,8 +511,6 @@ Patch112: die-floppy-die.patch
 
 Patch113: no-pcspkr-modalias.patch
 
-Patch114: silence-fbcon-logo.patch
-
 Patch115: Kbuild-Add-an-option-to-enable-GCC-VTA.patch
 
 Patch116: crash-driver.patch
@@ -1854,6 +1852,9 @@ fi
 #
 #
 %changelog
+* Mon Mar 18 2019 Jeremy Cline <jcline@redhat.com> - 5.1.0-0.rc1.git0.1
+- Linux v5.1-rc1
+
 * Mon Mar 18 2019 Jeremy Cline <jcline@redhat.com>
 - Disable debugging options.
 
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch
deleted file mode 100644
index 2054b3c6b..000000000
--- a/silence-fbcon-logo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a8a15723637c6dfbd5042b5c3453d31f5815f044 Mon Sep 17 00:00:00 2001
-From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
-Date: Thu, 29 Jul 2010 16:46:31 -0700
-Subject: [PATCH] silence fbcon logo
-
-Bugzilla: N/A
-Upstream-status: Fedora mustard
----
- drivers/video/fbdev/core/fbcon.c | 26 +++++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
-index afd3301ac40c..2e08ba0ade3e 100644
---- a/drivers/video/fbdev/core/fbcon.c
-+++ b/drivers/video/fbdev/core/fbcon.c
-@@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
- 		kfree(save);
- 	}
- 
--	if (logo_lines > vc->vc_bottom) {
--		logo_shown = FBCON_LOGO_CANSHOW;
--		printk(KERN_INFO
--		       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
--	} else if (logo_shown != FBCON_LOGO_DONTSHOW) {
--		logo_shown = FBCON_LOGO_DRAW;
--		vc->vc_top = logo_lines;
-+	if (logo_shown != FBCON_LOGO_DONTSHOW) {
-+		if (logo_lines > vc->vc_bottom) {
-+			logo_shown = FBCON_LOGO_CANSHOW;
-+			printk(KERN_INFO
-+			       "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
-+		} else {
-+			logo_shown = FBCON_LOGO_DRAW;
-+			vc->vc_top = logo_lines;
-+		}
- 	}
- }
- #endif /* MODULE */
-@@ -3671,4 +3671,15 @@ void __exit fb_console_exit(void)
- 	do_unregister_con_driver(&fb_con);
- 	console_unlock();
- }	
-+
-+#else
-+
-+static int __init quiet_logo(char *str)
-+{
-+	logo_shown = FBCON_LOGO_DONTSHOW;
-+	return 0;
-+}
-+
-+early_param("quiet", quiet_logo);
-+
- #endif
--- 
-2.7.4
-
diff --git a/sources b/sources
index 7951f1b4d..17ff4c626 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.0.tar.xz) = 3fbab70c7b03b1a10e9fa14d1e2e1f550faba4f5792b7699ca006951da74ab86e7d7f19c6a67849ab99343186e7d6f2752cd910d76222213b93c1eab90abf1b0
-SHA512 (patch-5.0-git9.xz) = 1c7b2585038be6194f7e5690d31ae50d35ff79a65d0d5e260c00efc40e26f3accd58ff3f19c155e47a66c4349f240ee9ce1e1bf76dd03b3f7bebe71b0d08a780
+SHA512 (patch-5.1-rc1.xz) = 013b5354de22870555cf604d756acb0ab90e4383c59e11671611a6dbd88de8cca4ca4727a428e5aa563b6aad66aad01539eee0d9adb594c58d18edffe3f2e82e