From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Apr 2015 21:51:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9a08da1c8b4865a16eb991776d4c53770eb6f31f;p=linux-beck.git

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

Pull ceph revert from Sage Weil:
 "This corrects a recent misadventure with __GFP_MEMALLOC and
  PF_MEMALLOC; it turns out it's not a good fit for RBD and we're better
  off relying on dirty page throttling"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  Revert "libceph: use memalloc flags for net IO"
---

9a08da1c8b4865a16eb991776d4c53770eb6f31f