git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b97fdef 6d7fdb0)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Apr 2015 21:51:56 +0000 (14:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Apr 2015 21:51:56 +0000 (14:51 -0700)
commit9a08da1c8b4865a16eb991776d4c53770eb6f31f
tree0c048bd2081fd0c6f66fae389ef455981353cf6etree | snapshot
parentb97fdef8e680ca8bdfea6114eea19fb6832d54becommit | diff
parent6d7fdb0ab351b33d4c12d53fe44be030b90fc9d4commit | diff
Merge branch 'for-linus' of git://git./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"
Pandora Kernel Repository