diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch | |
parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 05b0983d1..28d105c2a 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 cfaaa6a234d4..dab7302a3606 100644 +index 2803ec062a16..6753f8e17dfe 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -613,7 +613,7 @@ extern enum system_states { +@@ -612,7 +612,7 @@ extern enum system_states { #define TAINT_24 24 #define TAINT_25 25 #define TAINT_26 26 @@ -36,7 +36,7 @@ index cfaaa6a234d4..dab7302a3606 100644 #define TAINT_RESERVED28 28 #define TAINT_RESERVED29 29 diff --git a/kernel/panic.c b/kernel/panic.c -index e3bae852d92f..8ab004b0f846 100644 +index 2c483bec82d6..e1f2bf843901 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -395,7 +395,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |