From: Linus Torvalds Date: Sun, 24 Jan 2016 20:39:09 +0000 (-0800) Subject: Merge tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: drm-fsl-dcu-for-next~1749 X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=c52cb4311f20538fcb69420e55a19ac622546a08 Merge tag 'for-linus-4.5-merge-window' of git://git./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 --- c52cb4311f20538fcb69420e55a19ac622546a08