Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
  ceph: use separate class for ceph sockets' sk_lock
  ceph: reserve one more caps space when doing readdir
  ceph: queue_cap_snap should always queue dirty context
  ceph: fix dentry reference leak in dcache readdir
  ceph: decode v5 of osdmap (pool names) [protocol change]
  ceph: fix ack counter reset on connection reset
  ceph: fix leaked inode ref due to snap metadata writeback race
  ceph: fix snap context reference leaks
  ceph: allow writeback of snapped pages older than 'oldest' snapc
  ceph: fix dentry rehashing on virtual .snap dir

diff --cc fs/ceph/addr.c
Simple merge

diff --cc fs/ceph/caps.c
Simple merge

diff --cc fs/ceph/dir.c
Simple merge

diff --cc fs/ceph/messenger.c
Simple merge

diff --cc fs/ceph/osdmap.c
Simple merge

diff --cc fs/ceph/snap.c
Simple merge

diff --cc fs/ceph/super.h
Simple merge