tree 0c048bd2081fd0c6f66fae389ef455981353cf6e
parent b97fdef8e680ca8bdfea6114eea19fb6832d54be
parent 6d7fdb0ab351b33d4c12d53fe44be030b90fc9d4
author Linus Torvalds <torvalds@linux-foundation.org> 1428529916 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1428529916 -0700

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"