From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 May 2014 18:15:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: firefly_0821_release~176^2~3859
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=282695802957b069d293a9f8773a14399093bd6f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fix from Al Viro:
 "Oh, well...  Still nothing useful on that livelock (I had something
  that looked kinda-sorta like a non-invasive solution, but it
  deadlocks), so it's just Miklos' vmsplice fix for now"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: fix vmplice_to_user()
---

282695802957b069d293a9f8773a14399093bd6f