projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7ce14f6 521a04d)
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)
commit086e8ddb567951513a5dace21a09297768aee14f
tree0635d31153ea738e8d2b5b8c1491ccd6aa716c47tree | snapshot
parent7ce14f6ff26460819345fe8495cf2dd6538b7cdccommit | diff
parent521a04d06a729e5971cdee7f84080387ed320527commit | diff
Merge branch 'for-linus' of git://git./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
John Crispins staging tree