summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-24 21:39:09 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-24 21:39:09 +0100
commitc52cb4311f20538fcb69420e55a19ac622546a08 (patch)
treef3fb973aa9271276bb17f7c78ac1e9e26d97e5e6 /drivers
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff)
parentfs/9p: use fscache mutex rather than spinlock (diff)
downloadlinux-c52cb4311f20538fcb69420e55a19ac622546a08.tar.xz
linux-c52cb4311f20538fcb69420e55a19ac622546a08.zip
Merge tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull 9p updates from Eric Van Hensbergen: "Sorry for the last minute pull request, there's was a change that didn't get pulled into for-next until two weeks ago and I wanted to give it some bake time. Summary: Rework and error handling fixes, primarily in the fscatch and fd transports" * tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: fs/9p: use fscache mutex rather than spinlock 9p: trans_fd, bail out if recv fcall if missing 9p: trans_fd, read rework to use p9_parse_header net/9p: Add device name details on error
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions