diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
commit | 89964532af24450f52b6d01dacd294217911419e (patch) | |
tree | 6107bc5d1b68f05be5192c06027349030291ed60 /0001-Add-Red-Hat-tainting.patch | |
parent | 3dfb76094b2877be42c5c59e3dd88c08a12dfe54 (diff) | |
parent | b41e8da84d859a942949cba537c8ea69d0e87df4 (diff) | |
download | kernel-89964532af24450f52b6d01dacd294217911419e.tar.gz kernel-89964532af24450f52b6d01dacd294217911419e.tar.xz kernel-89964532af24450f52b6d01dacd294217911419e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.1.vanilla.2.fc34kernel-5.9.0-0.rc3.1.vanilla.2.fc33kernel-5.9.0-0.rc3.1.vanilla.2.fc32kernel-5.9.0-0.rc3.1.vanilla.2.fc31
Diffstat (limited to '0001-Add-Red-Hat-tainting.patch')
-rw-r--r-- | 0001-Add-Red-Hat-tainting.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch index 6a7f89e0a..842f01497 100644 --- a/0001-Add-Red-Hat-tainting.patch +++ b/0001-Add-Red-Hat-tainting.patch @@ -100,7 +100,7 @@ Signed-off-by: Philipp Rudo <prudo@redhat.com> create mode 100644 kernel/rh_taint.c diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 500def620d8f..c352ecdfcb43 100644 +index c25b8e41c0ea..c3dd56bf044f 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -1037,4 +1037,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } |