summaryrefslogtreecommitdiff
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-05-01 22:49:28 +0300
committerJiri Kosina <jkosina@suse.cz>2017-05-01 22:49:28 +0300
commita0841609f658c77f066af9c61a2e13143564fcb4 (patch)
tree0f0df468b6f852501cd4ed1570701e695b9f5d56 /Documentation/ABI
parent77f8f39a2e463eca89a19b916189d0e4e38f75d8 (diff)
parente679af627fe875a51d40b9a2b17f08fbde36e0e2 (diff)
downloadlinux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.xz
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/testing/sysfs-kernel-livepatch8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-kernel-livepatch b/Documentation/ABI/testing/sysfs-kernel-livepatch
index da87f43aec58..d5d39748382f 100644
--- a/Documentation/ABI/testing/sysfs-kernel-livepatch
+++ b/Documentation/ABI/testing/sysfs-kernel-livepatch
@@ -25,6 +25,14 @@ Description:
code is currently applied. Writing 0 will disable the patch
while writing 1 will re-enable the patch.
+What: /sys/kernel/livepatch/<patch>/transition
+Date: Feb 2017
+KernelVersion: 4.12.0
+Contact: live-patching@vger.kernel.org
+Description:
+ An attribute which indicates whether the patch is currently in
+ transition.
+
What: /sys/kernel/livepatch/<patch>/<object>
Date: Nov 2014
KernelVersion: 3.19.0