diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-23 20:28:25 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-23 20:28:25 +0200 |
commit | 086e8ddb567951513a5dace21a09297768aee14f (patch) | |
tree | 0635d31153ea738e8d2b5b8c1491ccd6aa716c47 /net/tipc/link.h | |
parent | Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Revert "libceph: clear r_req_lru_item in __unregister_linger_request()" (diff) | |
download | linux-086e8ddb567951513a5dace21a09297768aee14f.tar.xz linux-086e8ddb567951513a5dace21a09297768aee14f.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull two Ceph fixes from Sage Weil:
"These fix an issue with the RBD notifications when there are topology
changes in the cluster"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"
libceph: request a new osdmap if lingering request maps to no osd
Diffstat (limited to 'net/tipc/link.h')
0 files changed, 0 insertions, 0 deletions