diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 17:38:05 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-13 17:38:05 -0800 |
commit | 04e396277b5f171f8676defc5b720084f1cc0948 (patch) | |
tree | 9c9351b96f7d361cd70276e6d027791d277052b6 /include/trace | |
parent | Merge tag 'vfio-v4.10-rc4' of git://github.com/awilliam/linux-vfio (diff) | |
parent | ceph: fix get_oldest_context() (diff) | |
download | linux-dev-04e396277b5f171f8676defc5b720084f1cc0948.tar.xz linux-dev-04e396277b5f171f8676defc5b720084f1cc0948.zip |
Merge tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two small fixups for the filesystem changes that went into this merge
window"
* tag 'ceph-for-4.10-rc4' of git://github.com/ceph/ceph-client:
ceph: fix get_oldest_context()
ceph: fix mds cluster availability check
Diffstat (limited to 'include/trace')
0 files changed, 0 insertions, 0 deletions