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-add-Red-Hat-specific-taint-flags.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-add-Red-Hat-specific-taint-flags.patch')
-rw-r--r-- | 0001-add-Red-Hat-specific-taint-flags.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/0001-add-Red-Hat-specific-taint-flags.patch b/0001-add-Red-Hat-specific-taint-flags.patch index a157b6d6e..8179d8390 100644 --- a/0001-add-Red-Hat-specific-taint-flags.patch +++ b/0001-add-Red-Hat-specific-taint-flags.patch @@ -24,10 +24,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com> 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index c3dd56bf044f..f14f238dc36a 100644 +index 19291af895eb..ae2859863d59 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -602,7 +602,24 @@ extern enum system_states { +@@ -604,7 +604,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -54,7 +54,7 @@ index c3dd56bf044f..f14f238dc36a 100644 struct taint_flag { diff --git a/kernel/panic.c b/kernel/panic.c -index aef8872ba843..fe1d3decf61c 100644 +index e2157ca387c8..534bc76e43da 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |