From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 7 Apr 2016 23:34:26 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1c915b3ac4ecf6ff67573eed24458d862e842cb6;p=openwrt%2Fstaging%2Fblogic.git

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

Pull Ceph fix from Sage Weil:
 "This just fixes a few remaining memory allocations in RBD to use
  GFP_NOIO instead of GFP_ATOMIC"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  rbd: use GFP_NOIO consistently for request allocations
---

1c915b3ac4ecf6ff67573eed24458d862e842cb6