tree ed63f34e74998a8a1550d4af61b3178e68a5d60d
parent f23eb2b2b28547fc70df82dd5049eb39bec5ba12
parent 59c2be1e4d42c0d4949cecdeef3f37070a1fbc13
author Linus Torvalds <torvalds@linux-foundation.org> 1300836325 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300836325 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client

* git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use watch/notify for changes in rbd header
  libceph: add lingering request and watch/notify event framework
  rbd: update email address in Documentation
  ceph: rename dentry_release -> d_release, fix comment
  ceph: add request to the tail of unsafe write list
  ceph: remove request from unsafe list if it is canceled/timed out
  ceph: move readahead default to fs/ceph from libceph
  ceph: add ino32 mount option
  ceph: update common header files
  ceph: remove debugfs debug cruft
  libceph: fix osd request queuing on osdmap updates
  ceph: preserve I_COMPLETE across rename
  libceph: Fix base64-decoding when input ends in newline.