diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-05 20:33:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-05 20:33:10 -0700 |
| commit | bd779669945ed9982890da789ad32e3bd0d41f14 (patch) | |
| tree | 533868e890b6ff2751abf5c4072c105e25e4a4eb /kernel/locking/Makefile | |
| parent | 9cfcc658da9693f65e7224e8329e40ada2f3c699 (diff) | |
| parent | b5ac1fb2717e48177d3f73f9e4c9b556c0a24c6b (diff) | |
Merge tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p updates from Eric Van Hensbergen:
"Just a few cleanups for 4.3 merge window for the 9p file system. I've
gotten several more over the past week, but this group has been in
for-next for at least a couple of weeks so I figured I'd push them
first while I test the rest.
Most of the ones not in this set are bug-fixes anyways so I could hold
them for rc1"
* tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix return code of read() when count is 0
9p: remove unused option Opt_trans
Diffstat (limited to 'kernel/locking/Makefile')
0 files changed, 0 insertions, 0 deletions