]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2015 17:34:26 +0000 (09:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Dec 2015 17:34:26 +0000 (09:34 -0800)
commita554b13d1199370aa1dd35570487764ab8015d24
tree5382e4777f5947a8cd702d4031c46c1ec17b93a1
parentc20c06b8ea0a98f8d357a64c3401f6059bb3f0e5
parent37a0c8afeb88db6e23888fd6fbaba3653c068404
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