diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 16:16:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 16:16:58 -0700 |
| commit | e8b767f5e04097aaedcd6e06e2270f9fe5282696 (patch) | |
| tree | 1d8ba4a3bf81ea9ca7a0a3506745eccc9d93b058 /MAINTAINERS | |
| parent | a87a08e3bf2decaed29c4dfde3916676f9b966a8 (diff) | |
| parent | 82017457957a550d7d00dde419435dd74a890887 (diff) | |
| download | lwn-e8b767f5e04097aaedcd6e06e2270f9fe5282696.tar.gz lwn-e8b767f5e04097aaedcd6e06e2270f9fe5282696.zip | |
Merge tag 'for-linus-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML updates from Richard Weinberger:
- Devicetree support (for testing)
- Various cleanups and fixes: UBD, port_user, uml_mconsole
- Maintainer update
* tag 'for-linus-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: run_helper: Write error message to kernel log on exec failure on host
um: port_user: Improve error handling when port-helper is not found
um: port_user: Allow setting path to port-helper using UML_PORT_HELPER envvar
um: port_user: Search for in.telnetd in PATH
um: clang: Strip out -mno-global-merge from USER_CFLAGS
docs: UML: Mention telnetd for port channel
um: Remove unused timeval_to_ns() function
um: Fix uml_mconsole stop/go
um: Cleanup syscall_handler_t definition/cast, fix warning
uml: net: vector: fix const issue
um: Fix WRITE_ZEROES in the UBD Driver
um: Migrate vector drivers to NAPI
um: Fix order of dtb unflatten/early init
um: fix and optimize xor select template for CONFIG64 and timetravel mode
um: Document dtb command line option
lib/logic_iomem: correct fallback config references
um: Remove duplicated include in syscalls_64.c
MAINTAINERS: Update UserModeLinux entry
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cf896438366b..cbbd3ce7e0c2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -20539,14 +20539,15 @@ F: Documentation/admin-guide/media/zr364xx* F: drivers/media/usb/zr364xx/ USER-MODE LINUX (UML) -M: Jeff Dike <jdike@addtoit.com> M: Richard Weinberger <richard@nod.at> M: Anton Ivanov <anton.ivanov@cambridgegreys.com> +M: Johannes Berg <johannes@sipsolutions.net> L: linux-um@lists.infradead.org S: Maintained W: http://user-mode-linux.sourceforge.net Q: https://patchwork.ozlabs.org/project/linux-um/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git next +T: git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git fixes F: Documentation/virt/uml/ F: arch/um/ F: arch/x86/um/ |