diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-28 18:15:57 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-28 18:15:57 (GMT) |
commit | 282695802957b069d293a9f8773a14399093bd6f (patch) | |
tree | c362f39413243fb3f153104afa81028dad497b07 /lib/plist.c | |
parent | 4efdedca932658cc54866ee19001af3cbffa3769 (diff) | |
parent | b6dd6f4738837439c520e73995ec93fe1de2ec72 (diff) | |
download | linux-282695802957b069d293a9f8773a14399093bd6f.tar.xz |
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()
Diffstat (limited to 'lib/plist.c')
0 files changed, 0 insertions, 0 deletions