Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2016 01:59:24 +0000 (18:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2016 01:59:24 +0000 (18:59 -0700)
commit6fa9bffbccb91e07519e1deb05e001d191f0df43
tree2d631fb0cfd0af005ab04cf1dcbbec20ba414435
parentcf681c2ebcb502ced998ca0659b2907b9ad9daf9
parentd3767f0faeda5abdf205f947ae912d48dc70fa06
Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes from Sage Weil:
 "There is a lifecycle fix in the auth code, a fix for a narrow race
  condition on map, and a helpful message in the log when there is a
  feature mismatch (which happens frequently now that the default
  server-side options have changed)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: report unsupported features to syslog
  rbd: fix rbd map vs notify races
  libceph: make authorizer destruction independent of ceph_auth_client