diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-06 09:01:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-06 09:01:45 -0700 |
| commit | b77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5 (patch) | |
| tree | 4069743339aeca5a77a58eedb694621471af4683 /tools/perf/scripts/python/sctop.py | |
| parent | Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs (diff) | |
| parent | ceph: fix __choose_mds() for LSSNAP request (diff) | |
| download | wireguard-linux-b77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5.tar.xz wireguard-linux-b77779b93d7a38d9a7f3462b83f6e6fadb6b9ce5.zip | |
Merge tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two fixups for CephFS snapshot-handling patches in -rc1"
* tag 'ceph-for-4.14-rc4' of git://github.com/ceph/ceph-client:
ceph: fix __choose_mds() for LSSNAP request
ceph: properly queue cap snap for newly created snap realm
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions