]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 May 2015 18:28:25 +0000 (11:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 May 2015 18:28:25 +0000 (11:28 -0700)
commit7783691bb5e8f13142d609f4111ba552172ef97b
tree0635d31153ea738e8d2b5b8c1491ccd6aa716c47
parentdb2e1b2f1f4a35ca806b546befe088e0acca41d8
parent64ee5cbc120cd8af5289bcbb5914e6004fe22e2b
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