From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Sep 2012 23:13:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bee2d97b2c4583c2471aa65ab9c189a0011f62b3;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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

Pull two ceph fixes from Sage Weil:
 "The first fixes a leak in the rbd setup error path, and the second
  fixes a more serious problem with mismatched kmap/kunmap that surfaced
  after the recent refactoring work."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  libceph: only kunmap kmapped pages
  rbd: drop dev reference on error in rbd_open()
---

bee2d97b2c4583c2471aa65ab9c189a0011f62b3