diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-30 18:44:02 +0200 |
| commit | e5237f62c21f764ed70f1abcea884b15f30ca984 (patch) | |
| tree | 30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | |
| parent | e3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff) | |
| parent | 8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff) | |
| download | kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
| -rw-r--r-- | 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 6 |
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 \ |