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-kernel-add-SUPPORT_REMOVED-kernel-taint.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-kernel-add-SUPPORT_REMOVED-kernel-taint.patch')
| -rw-r--r-- | 0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch index 75fd7a2f3..e07ddff84 100644 --- a/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch +++ b/0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch @@ -23,10 +23,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index e355907f5d6c..7a7a47665771 100644 +index 3ab563aa9e64..b40d76529ddd 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -612,7 +612,7 @@ extern enum system_states { +@@ -614,7 +614,7 @@ extern enum system_states { #define TAINT_24 24 #define TAINT_25 25 #define TAINT_26 26 @@ -36,7 +36,7 @@ index e355907f5d6c..7a7a47665771 100644 #define TAINT_RESERVED28 28 #define TAINT_RESERVED29 29 diff --git a/kernel/panic.c b/kernel/panic.c -index 2c483bec82d6..e1f2bf843901 100644 +index e3bae852d92f..8ab004b0f846 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -395,7 +395,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |