diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | |
parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch')
-rw-r--r-- | 0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch b/0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch index de2a541be..873882a66 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 19d57bfc12f9..e677bb144835 100644 #endif diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 8588bb62e74c..b372b2daae7f 100644 +index 0a0081b10edb..cfaaa6a234d4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -1049,7 +1049,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1058,7 +1058,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } struct module; |