From 9093de6052587d7d1398b4e8996e955b4aaec331 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 20 Jun 2017 18:17:29 +0200
Subject: MAINTAINERS: Correct path to uDraw PS3 driver

Signed-off-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MAINTAINERS')

diff --git a/MAINTAINERS b/MAINTAINERS
index ef23cf5f74c2..dd1248f5e481 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13756,7 +13756,7 @@ UDRAW TABLET
 M:	Bastien Nocera <hadess@hadess.net>
 L:	linux-input@vger.kernel.org
 S:	Maintained
-F:	drivers/hid/hid-udraw.c
+F:	drivers/hid/hid-udraw-ps3.c
 
 UFS FILESYSTEM
 M:	Evgeniy Dushistov <dushistov@mail.ru>
-- 
cgit 


From 32c210d724156a4c20f8465f83c445f6c47e2eb2 Mon Sep 17 00:00:00 2001
From: Michal Marek <michal.lkml@markovi.net>
Date: Thu, 5 Oct 2017 22:39:04 +0200
Subject: MAINTAINERS: Update my email address

I changed jobs recently, but the MAINTAINERS file was not mentioned in
the HR checklist, hence a belated update.

Signed-off-by: Michal Marek <michal.lkml@markovi.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'MAINTAINERS')

diff --git a/MAINTAINERS b/MAINTAINERS
index dd1248f5e481..9627cb7a3b5f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3465,7 +3465,7 @@ COCCINELLE/Semantic Patches (SmPL)
 M:	Julia Lawall <Julia.Lawall@lip6.fr>
 M:	Gilles Muller <Gilles.Muller@lip6.fr>
 M:	Nicolas Palix <nicolas.palix@imag.fr>
-M:	Michal Marek <mmarek@suse.com>
+M:	Michal Marek <michal.lkml@markovi.net>
 L:	cocci@systeme.lip6.fr (moderated for non-subscribers)
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git misc
 W:	http://coccinelle.lip6.fr/
@@ -7465,7 +7465,7 @@ F:	fs/autofs4/
 
 KERNEL BUILD + files below scripts/ (unless maintained elsewhere)
 M:	Masahiro Yamada <yamada.masahiro@socionext.com>
-M:	Michal Marek <mmarek@suse.com>
+M:	Michal Marek <michal.lkml@markovi.net>
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git
 L:	linux-kbuild@vger.kernel.org
 S:	Maintained
-- 
cgit 


From 1972d6c0c86dd8620ff9f2811ce875135ffb5405 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Date: Mon, 10 Apr 2017 22:10:34 +0200
Subject: MAINTAINERS: relinquish kconfig

Since about the time I was actually added in that file, I've been
almost entirely absent, which totally sucks, and there is no excuse
for my behaviour and for not having relinquished this earlier.

My deepest apologies.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Vincent Legoll <vincent.legoll@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
 MAINTAINERS | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'MAINTAINERS')

diff --git a/MAINTAINERS b/MAINTAINERS
index 9627cb7a3b5f..b1c106055a38 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7433,10 +7433,8 @@ F:	mm/kasan/
 F:	scripts/Makefile.kasan
 
 KCONFIG
-M:	"Yann E. MORIN" <yann.morin.1998@free.fr>
 L:	linux-kbuild@vger.kernel.org
-T:	git git://gitorious.org/linux-kconfig/linux-kconfig
-S:	Maintained
+S:	Orphan
 F:	Documentation/kbuild/kconfig-language.txt
 F:	scripts/kconfig/
 
-- 
cgit