]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'ceph-for-5.0-rc4' of git://github.com/ceph/ceph-client
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2019 16:59:22 +0000 (05:59 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jan 2019 16:59:22 +0000 (05:59 +1300)
Pull ceph fixes from Ilya Dryomov:
 "A fix for a potential use-after-free, a patch to close a (mostly
  benign) race in the messenger and a licence clarification for quota.c"

* tag 'ceph-for-5.0-rc4' of git://github.com/ceph/ceph-client:
  ceph: quota: cleanup license mess
  libceph: avoid KEEPALIVE_PENDING races in ceph_con_keepalive()
  ceph: clear inode pointer when snap realm gets dropped by its inode


Trivial merge