From: Linus Torvalds Date: Fri, 14 Apr 2006 16:11:34 +0000 (-0700) Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi... X-Git-Tag: v2.6.17-rc2~73 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a7e9f1c60bada782014b2f422f6c68c4d5388f3;p=linux-2.6 Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mszeredi/fuse: [fuse] Direct I/O should not use fuse_reset_request [fuse] Don't init request twice [fuse] Fix accounting the number of waiting requests [fuse] fix deadlock between fuse_put_super() and request_end() --- 9a7e9f1c60bada782014b2f422f6c68c4d5388f3