From c49d88579875e966e2959d09a17f282dc9876324 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 2 Nov 2020 10:27:06 -0600 Subject: kernel-5.10.0-0.rc2.61.test * Mon Nov 02 2020 Fedora Kernel Team [5.10.0-0.rc2.61.test] - v5.10-rc2 rebase Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.10.0-redhat.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'patch-5.10.0-redhat.patch') diff --git a/patch-5.10.0-redhat.patch b/patch-5.10.0-redhat.patch index 40160aeee..624e0d5ac 100644 --- a/patch-5.10.0-redhat.patch +++ b/patch-5.10.0-redhat.patch @@ -203,7 +203,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index ee2284a5cad2..2c08fcabe616 100644 +index 9e7fd6a065a7..cc3f21bf5d51 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -288,10 +288,10 @@ index a13d90206472..6a6aae01755b 100644 #define get_user(x, p) \ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index f858c352f72a..35579b9dd9a5 100644 +index 1d466addb078..516a53104f3e 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -871,7 +871,7 @@ endchoice +@@ -891,7 +891,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -300,7 +300,7 @@ index f858c352f72a..35579b9dd9a5 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1130,6 +1130,7 @@ config XEN +@@ -1150,6 +1150,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) @@ -2287,7 +2287,7 @@ index c503f7ab8afb..909e4fb32458 100644 * * @perf_event_open: diff --git a/include/linux/module.h b/include/linux/module.h -index 7ccdf87f376f..bff07f39198d 100644 +index 6264617bab4d..d4202ef4c598 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -372,6 +372,7 @@ struct module { -- cgit