From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Oct 2012 15:49:25 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: v3.7-rc4~24
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=35fd3dc58da675d659513384221349ef90749a01;p=cascardo%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/sage/ceph-client

Pull Ceph fixes form Sage Weil:
 "There are two fixes in the messenger code, one that can trigger a NULL
  dereference, and one that error in refcounting (extra put).  There is
  also a trivial fix that in the fs client code that is triggered by NFS
  reexport."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: fix dentry reference leak in encode_fh()
  libceph: avoid NULL kref_put when osd reset races with alloc_msg
  rbd: reset BACKOFF if unable to re-queue
---

35fd3dc58da675d659513384221349ef90749a01