From: Linus Torvalds Date: Wed, 9 Dec 2015 17:34:26 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs X-Git-Tag: v5.15~14591 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=626d114f46fedb66f56bfbea4743ab68ab88e590;p=mirror_ubuntu-kernels.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs Pull vfs fixes from Al Viro: "A couple of fixes, both -stable fodder (9p one all way back to 2.6.32, dio - to all branches where "Fix negative return from dio read beyond eof" will end up it; it's a fixup to commit marked for -stable)" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fix the regression from "direct-io: Fix negative return from dio read beyond eof" 9p: ->evict_inode() should kick out ->i_data, not ->i_mapping --- 626d114f46fedb66f56bfbea4743ab68ab88e590