diff options
| author | Linus Torvalds <[email protected]> | 2014-05-28 18:15:57 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-05-28 18:15:57 +0000 |
| commit | 282695802957b069d293a9f8773a14399093bd6f (patch) | |
| tree | c362f39413243fb3f153104afa81028dad497b07 /tools/perf/scripts/python/sctop.py | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | vfs: fix vmplice_to_user() (diff) | |
| download | kernel-282695802957b069d293a9f8773a14399093bd6f.tar.gz kernel-282695802957b069d293a9f8773a14399093bd6f.zip | |
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 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions