diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-09 20:34:26 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-09 20:34:26 +0300 |
commit | 626d114f46fedb66f56bfbea4743ab68ab88e590 (patch) | |
tree | 5382e4777f5947a8cd702d4031c46c1ec17b93a1 /arch/nios2 | |
parent | 978d6a90411ca92e591f3434c98d200e4e3dc5dd (diff) | |
parent | 2d4594acbf6d8f75a27f3578476b6a27d8b13ebb (diff) | |
download | linux-626d114f46fedb66f56bfbea4743ab68ab88e590.tar.xz |
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
Diffstat (limited to 'arch/nios2')
0 files changed, 0 insertions, 0 deletions