summaryrefslogtreecommitdiffstats
path: root/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-09-30 10:55:26 -0500
commit8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (patch)
treee2baee2da7d349311c64f206a6a3dd6eb8935211 /0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
parent430af957008fa73bd81840a407110ed7a979ae02 (diff)
downloadkernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.gz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.tar.xz
kernel-8bf7e7fde6b9176ccaac91a0c95464f326d8a008.zip
kernel-5.9.0-0.rc7.20200930gitfb0155a09b02.21
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
-rw-r--r--0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
index f39429a5a..cb2475171 100644
--- a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
+++ b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch
@@ -51,10 +51,10 @@ index a1a012702915..b57e6dd6d7ef 100644
#endif
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 156d1e44d9f7..e355907f5d6c 100644
+index f24819663517..3ab563aa9e64 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
-@@ -1057,7 +1057,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+@@ -1059,7 +1059,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
struct module;
@@ -64,7 +64,7 @@ index 156d1e44d9f7..e355907f5d6c 100644
void mark_hardware_deprecated(const char *msg);
void mark_tech_preview(const char *msg, struct module *mod);
diff --git a/kernel/Makefile b/kernel/Makefile
-index 4fbfd2a0800c..a591962f7906 100644
+index d744b63c07dc..1916714ba4b6 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -14,6 +14,7 @@ obj-y = fork.o exec_domain.o panic.o \