Merge tag 'ceph-for-4.11-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:35:39 +0000 (14:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Mar 2017 21:35:39 +0000 (14:35 -0700)
commit59d9cb91d07236b5255a3b1999f6f2d9985b3657
treedf5d56796d70c53cef1752e9ebd397f4fe4a92ed
parent2056b7c7df94d9c3e81bcee7430fe2417158e455
parent633ee407b9d15a75ac9740ba9d3338815e1fcb95
Merge tag 'ceph-for-4.11-rc4' of git://github.com/ceph/ceph-client

Pull ceph fix from Ilya Dryomov:
 "A fix for a writeback deadlock caused by a GFP_KERNEL allocation on
  the reclaim path, tagged for stable"

* tag 'ceph-for-4.11-rc4' of git://github.com/ceph/ceph-client:
  libceph: force GFP_NOIO for socket allocations