From: Linus Torvalds Date: Wed, 5 Jun 2013 00:03:31 +0000 (+0900) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... X-Git-Tag: v3.10-rc5~30 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8764d86100fe58e69877753faa44fc1d9276c624;p=~andy%2Flinux Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse Pull fuse fixes from Miklos Szeredi: "One patch fixes an Oops introduced in 3.9 with the readdirplus feature. The rest are fixes for async-dio in 3.10" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix alignment in short read optimization for async_dio fuse: return -EIOCBQUEUED from fuse_direct_IO() for all async requests fuse: fix readdirplus Oops in fuse_dentry_revalidate fuse: update inode size and invalidate attributes on fallocate fuse: truncate pagecache range on hole punch fuse: allocate for_background dio requests based on io->async state --- 8764d86100fe58e69877753faa44fc1d9276c624