summaryrefslogtreecommitdiffstats
path: root/patch-5.12.0-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-04-16 08:52:54 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-04-16 08:52:54 -0500
commit458d73dcd092f03ec25f7f5a4812e44c33c3b7db (patch)
tree81dc9fdeafc60e0da2cc9f6a506ea695c813a4d2 /patch-5.12.0-redhat.patch
parent1cdaef5942a2db3f94961091eb2e4ad5f4809d8e (diff)
downloadkernel-458d73dcd092f03ec25f7f5a4812e44c33c3b7db.tar.gz
kernel-458d73dcd092f03ec25f7f5a4812e44c33c3b7db.tar.xz
kernel-458d73dcd092f03ec25f7f5a4812e44c33c3b7db.zip
kernel-5.12.0-0.rc7.20210416git7e25f40eab52.191
* Fri Apr 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc7.20210416git7e25f40eab52.191] - filter-modules.sh.fedora: clean up "netprots" (Paul Bolle) - filter-modules.sh.fedora: clean up "scsidrvs" (Paul Bolle) - filter-*.sh.fedora: clean up "ethdrvs" (Paul Bolle) - filter-*.sh.fedora: clean up "driverdirs" (Paul Bolle) - filter-*.sh.fedora: remove incorrect entries (Paul Bolle) - filter-*.sh.fedora: clean up "singlemods" (Paul Bolle) - filter-modules.sh.fedora: drop unused list "iiodrvs" (Paul Bolle) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.12.0-redhat.patch')
-rw-r--r--patch-5.12.0-redhat.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index cf03fea63..3d58921e5 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -194,7 +194,7 @@ index 5da96f5df48f..a35494d5910d 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index e4e1b6550115..800dd64437a8 100644
+index dfdc3e0af5e1..cffbf8b26b7c 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -909,7 +909,7 @@ endchoice
@@ -290,7 +290,7 @@ index ab640abe26b6..dad705387133 100644
setup_force_cpu_cap(X86_FEATURE_CPUID);
cpu_parse_early_param();
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 5ecd69a48393..36549c6170bf 100644
+index ccab6cf91283..86b35b387c22 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -18,6 +18,7 @@
@@ -376,7 +376,7 @@ index 5ecd69a48393..36549c6170bf 100644
dmi_setup();
/*
-@@ -1115,19 +1168,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1112,19 +1165,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
@@ -397,7 +397,7 @@ index 5ecd69a48393..36549c6170bf 100644
reserve_initrd();
-@@ -1230,6 +1271,8 @@ void __init setup_arch(char **cmdline_p)
+@@ -1229,6 +1270,8 @@ void __init setup_arch(char **cmdline_p)
efi_apply_memmap_quirks();
#endif