summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-07 16:34:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-07 16:34:26 -0700
commit1c915b3ac4ecf6ff67573eed24458d862e842cb6 (patch)
tree78d62528d884465b530b418ec3644d208db638a4 /fs
parentd3436a1d03f9a416d8bedd968f16296e0140adcb (diff)
parent2224d879c7c0f85c14183ef82eb48bd875ceb599 (diff)
downloadlinux-1c915b3ac4ecf6ff67573eed24458d862e842cb6.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions