]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 987dd61 7ab4a71)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 May 2014 18:15:57 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 May 2014 18:15:57 +0000 (11:15 -0700)
commita0788c63ab7b7aafcda60c577bf8d3ca82628f79
treec362f39413243fb3f153104afa81028dad497b07tree | snapshot
parent987dd61611249a5b78e236cfebb8b15f9969811ccommit | diff
parent7ab4a7114bab35bda7ec7340dae71ce0c1cb66f0commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()
Linux Kernel Source Tree.