From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Jun 2013 18:47:46 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Tag: firefly_0821_release~3680^2~262
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=78750f1908869c3bfcbf2a1f1f00f078f2948271;p=firefly-linux-kernel-4.4.55.git

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

Pull Ceph fix from Sage Weil:
 "This fixes another problem with using v2 images on 3.10 due to the
  order in which fields are read from the image header.

  Hopefully this is the last one"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: fetch object order before using it
---

78750f1908869c3bfcbf2a1f1f00f078f2948271