From: Linus Torvalds Date: Thu, 20 Oct 2016 16:57:51 +0000 (-0700) Subject: Merge tag 'ceph-for-4.9-rc2' of git://github.com/ceph/ceph-client X-Git-Tag: v6.1~15568 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdcff41597e823a4b5117698fb3ad0cf833e10ac;p=sdk%2Femulator%2Femulator-kernel.git Merge tag 'ceph-for-4.9-rc2' of git://github.com/ceph/ceph-client Pull Ceph fixes from Ilya Dryomov: "An rbd exclusive-lock edge case fix and several filesystem fixups. Nikolay's error path patch is tagged for stable, everything else but readdir vs frags race was introduced in this merge window" * tag 'ceph-for-4.9-rc2' of git://github.com/ceph/ceph-client: ceph: fix non static symbol warning ceph: fix uninitialized dentry pointer in ceph_real_mount() ceph: fix readdir vs fragmentation race ceph: fix error handling in ceph_read_iter rbd: don't retry watch reregistration if header object is gone rbd: don't wait for the lock forever if blacklisted --- bdcff41597e823a4b5117698fb3ad0cf833e10ac