diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 17:45:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-18 17:45:30 -0400 |
| commit | dba94f2155f581395ef9608418778e3491b3d470 (patch) | |
| tree | 71b034aa2f6bafd5bb7ffcefe68c89cef6bbfc6d /kernel/smp.c | |
| parent | Merge branch 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | net/9p: add a privport option for RDMA transport. (diff) | |
| download | linux-dev-dba94f2155f581395ef9608418778e3491b3d470.tar.xz linux-dev-dba94f2155f581395ef9608418778e3491b3d470.zip | |
Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9pfs updates from Eric Van Hensbergen:
"Some accumulated cleanup patches for kerneldoc and unused variables as
well as some lock bug fixes and adding privateport option for RDMA"
* tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
net/9p: add a privport option for RDMA transport.
fs/9p: Initialize status in v9fs_file_do_lock.
net/9p: Initialize opts->privport as it should be.
net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()
9p: use unsigned integers for nwqid/count
9p: do not crash on unknown lock status code
9p: fix error handling in v9fs_file_do_lock
9p: remove unused variable in p9_fd_create()
9p: kerneldoc warning fixes
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions