Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 54c7ce00d85fc4b549815d968dd973487ed68d17..71b6c430811942f48db154d79cdd049184fd9225 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5853,6 +5853,21 @@ F:       Documentation/misc-devices/lis3lv02d
 F:     drivers/misc/lis3lv02d/
 F:     drivers/platform/x86/hp_accel.c
 
+LIVE PATCHING
+M:     Josh Poimboeuf <jpoimboe@redhat.com>
+M:     Seth Jennings <sjenning@redhat.com>
+M:     Jiri Kosina <jkosina@suse.cz>
+M:     Vojtech Pavlik <vojtech@suse.cz>
+S:     Maintained
+F:     kernel/livepatch/
+F:     include/linux/livepatch.h
+F:     arch/x86/include/asm/livepatch.h
+F:     arch/x86/kernel/livepatch.c
+F:     Documentation/ABI/testing/sysfs-kernel-livepatch
+F:     samples/livepatch/
+L:     live-patching@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+
 LLC (802.2)
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:     Maintained