diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 12:55:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-09 12:55:13 -0700 |
| commit | 899dd388853071f5c8848545209d4e2c5d95b1d9 (patch) | |
| tree | d3ff654d58b96c3b93f29e5ae5084d94283dfeea /MAINTAINERS | |
| parent | 9a5889ae1ce41f376e6a5b56e17e0c5a755fda80 (diff) | |
| parent | 2315cb14010c4cb0eb7c1d19fcf90475e4688207 (diff) | |
| download | blackbird-op-linux-899dd388853071f5c8848545209d4e2c5d95b1d9.tar.gz blackbird-op-linux-899dd388853071f5c8848545209d4e2c5d95b1d9.zip | |
Merge tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p update from Eric Van Hensbergen:
"Grab bag of little fixes and enhancements:
- optional security enhancements
- fix path coverage in MAINTAINERS
- switch to using most used protocol and transport as default
- clean up buffer dumps in trace code
Held off on RDMA patches as they need to be cleaned up a bit, but will
try to get the cleaned, checked, and pushed by mid-week"
* tag 'for-linus-3.11-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: Add rest of 9p files to MAINTAINERS entry
9p: trace: use %*ph to dump buffer
net/9p: Handle error in zero copy request correctly for 9p2000.u
net/9p: Use virtio transpart as the default transport
net/9p: Make 9P2000.L the default protocol for 9p file system
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 97762ad25300..e03c40eb39e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -180,6 +180,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git S: Maintained F: Documentation/filesystems/9p.txt F: fs/9p/ +F: net/9p/ +F: include/net/9p/ +F: include/uapi/linux/virtio_9p.h +F: include/trace/events/9p.h + A8293 MEDIA DRIVER M: Antti Palosaari <crope@iki.fi> |
