diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-16 06:50:51 +0900 |
| commit | 8d1e5133bf260aabdf2cc6facd4a8e696414d16a (patch) | |
| tree | 0e152a07b3892546879f55028b26b1701f7de8e6 /MAINTAINERS | |
| parent | 6a4d4b3253c1341843ba473429cf76a0e54f053d (diff) | |
| parent | 5ec9121195a4f1cecd0fa592636c5f81eb03dc8c (diff) | |
| download | linux-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.tar.gz linux-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.tar.bz2 linux-8d1e5133bf260aabdf2cc6facd4a8e696414d16a.zip | |
Merge branch 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull uml updates from Richard Weinberger:
"Minor updates for UML:
- fixes for our new vector network driver by Anton
- initcall cleanup by Alexander
- We have a new mailinglist, sourceforge.net sucks"
* 'for-linus-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: Fix raw interface options
um: Fix initialization of vector queues
um: remove uml initcalls
um: Update mailing list address
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3b263e2e216a..a5f04264ad10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15015,8 +15015,7 @@ F: drivers/media/usb/zr364xx/ USER-MODE LINUX (UML) M: Jeff Dike <jdike@addtoit.com> M: Richard Weinberger <richard@nod.at> -L: user-mode-linux-devel@lists.sourceforge.net -L: user-mode-linux-user@lists.sourceforge.net +L: linux-um@lists.infradead.org W: http://user-mode-linux.sourceforge.net T: git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git S: Maintained |