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-Add-Red-Hat-tainting.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-Add-Red-Hat-tainting.patch')
| -rw-r--r-- | 0001-Add-Red-Hat-tainting.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Add-Red-Hat-tainting.patch b/0001-Add-Red-Hat-tainting.patch index afe40ccfb..f743a025d 100644 --- a/0001-Add-Red-Hat-tainting.patch +++ b/0001-Add-Red-Hat-tainting.patch @@ -100,10 +100,10 @@ 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 9b7a8d74a9d6..2cb1c4fea0c9 100644 +index 82d91547d122..b82db0c0caec 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -1029,4 +1029,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -1038,4 +1038,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) |