Merge remote-tracking branch 'thermal/next'

[karo-tx-linux.git] / Documentation / oops-tracing.txt

diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index c10c022b911cb7b1dd46bd61baabde516cd92bed..13032c0140d430b3bc15a5e4a5771eecfc208f4e 100644 (file)
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -256,9 +256,15 @@ characters, each representing a particular tainted value.
   9: 'A' if the ACPI table has been overridden.
 
  10: 'W' if a warning has previously been issued by the kernel.
+     (Though some warnings may set more specific taint flags.)
 
  11: 'C' if a staging driver has been loaded.
 
+ 12: 'I' if the kernel is working around a severe bug in the platform
+     firmware (BIOS or similar).
+
+ 13: 'O' if an externally-built ("out-of-tree") module has been loaded.
+
 The primary reason for the 'Tainted: ' string is to tell kernel
 debuggers if this is a clean kernel or if anything unusual has
 occurred.  Tainting is permanent: even if an offending module is