| commit | 282695802957b069d293a9f8773a14399093bd6f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 28 11:15:57 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 28 11:15:57 2014 -0700 |
| tree | c362f39413243fb3f153104afa81028dad497b07 | |
| parent | 4efdedca932658cc54866ee19001af3cbffa3769 [diff] | |
| parent | b6dd6f4738837439c520e73995ec93fe1de2ec72 [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()