projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3436a1 2224d87)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2016 23:34:26 +0000 (16:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2016 23:34:26 +0000 (16:34 -0700)
commit1c915b3ac4ecf6ff67573eed24458d862e842cb6
tree78d62528d884465b530b418ec3644d208db638a4tree | snapshot
parentd3436a1d03f9a416d8bedd968f16296e0140adcbcommit | diff
parent2224d879c7c0f85c14183ef82eb48bd875ceb599commit | diff
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
John Crispins staging tree