Merge 5.18-rc5 into tty-next

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 87bbc80..9cda56c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13301,7 +13301,7 @@ F:      drivers/net/phy/motorcomm.c
 MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 M:     Jiri Slaby <jirislaby@kernel.org>
 S:     Maintained
-F:     Documentation/driver-api/serial/moxa-smartio.rst
+F:     Documentation/driver-api/tty/moxa-smartio.rst
 F:     drivers/tty/mxser.*
 
 MR800 AVERMEDIA USB FM RADIO DRIVER
@@ -21443,6 +21443,15 @@ F:     arch/x86/include/asm/uv/
 F:     arch/x86/kernel/apic/x2apic_uv_x.c
 F:     arch/x86/platform/uv/
 
+X86 STACK UNWINDING
+M:     Josh Poimboeuf <jpoimboe@redhat.com>
+M:     Peter Zijlstra <peterz@infradead.org>
+S:     Supported
+F:     arch/x86/include/asm/unwind*.h
+F:     arch/x86/kernel/dumpstack.c
+F:     arch/x86/kernel/stacktrace.c
+F:     arch/x86/kernel/unwind_*.c
+
 X86 VDSO
 M:     Andy Lutomirski <luto@kernel.org>
 L:     linux-kernel@vger.kernel.org