Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Nov 2015 23:11:08 +0000 (15:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Nov 2015 23:11:08 +0000 (15:11 -0800)
commit78c4a49a69e910a162b05e4e8727b9bdbf948f13
tree530261397ea6da3252ecbbedda242a1d338251c7
parent9b81d512a4a89dadfd3887d1b4443eeb2c20c573
parentc2489e07c0a71a56fb2c84bc0ee66cddfca7d068
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A couple of fixes for sendfile lockups caught by Dmitry + a fix for
  ancient sysvfs symlink breakage"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: Avoid softlockups with sendfile(2)
  vfs: Make sendfile(2) killable even better
  fix sysvfs symlinks