summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2019-03-05 15:55:59 +0100
committerJiri Kosina <jkosina@suse.cz>2019-03-05 15:55:59 +0100
commit67bae14adc8cdb650b042319136b74cffbad23c8 (patch)
tree550db9602f14f9aeeb6ab2f842c7e4491bf1c3cb /MAINTAINERS
parentbae054372aba0100e7b320f768c4875b5f0c23b3 (diff)
parentb73d5dc72272c0012999f939476b703d269d21b6 (diff)
Merge branch 'for-5.0/upstream-fixes' into for-linus
Document change towards group maintainership of livepatching code samples/ warning fix from Nicholas Mc Guire
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b1c5cf166703..7bd760639b78 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8820,10 +8820,10 @@ F: drivers/platform/x86/hp_accel.c
LIVE PATCHING
M: Josh Poimboeuf <jpoimboe@redhat.com>
-M: Jessica Yu <jeyu@kernel.org>
M: Jiri Kosina <jikos@kernel.org>
M: Miroslav Benes <mbenes@suse.cz>
-R: Petr Mladek <pmladek@suse.com>
+M: Petr Mladek <pmladek@suse.com>
+R: Joe Lawrence <joe.lawrence@redhat.com>
S: Maintained
F: kernel/livepatch/
F: include/linux/livepatch.h
@@ -8834,7 +8834,7 @@ F: Documentation/ABI/testing/sysfs-kernel-livepatch
F: samples/livepatch/
F: tools/testing/selftests/livepatch/
L: live-patching@vger.kernel.org
-T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git
LLC (802.2)
L: netdev@vger.kernel.org