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-add-Red-Hat-specific-taint-flags.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-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 12d4809b9..8dfd61c5f 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 b82db0c0caec..28be75396242 100644 +index c352ecdfcb43..8d3eaa27b082 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -603,7 +603,24 @@ extern enum system_states { +@@ -602,7 +602,24 @@ extern enum system_states { #define TAINT_LIVEPATCH 15 #define TAINT_AUX 16 #define TAINT_RANDSTRUCT 17 @@ -54,7 +54,7 @@ index b82db0c0caec..28be75396242 100644 struct taint_flag { diff --git a/kernel/panic.c b/kernel/panic.c -index e2157ca387c8..534bc76e43da 100644 +index aef8872ba843..fe1d3decf61c 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { |