Merge remote-tracking branch 'ceph/master'

Conflicts:
	net/ceph/messenger.c
	net/ceph/osd_client.c

diff --cc include/linux/ceph/messenger.h
Simple merge

diff --cc net/ceph/messenger.c
index 10255e81be79d84c5428504c2a79be3180626f79,23073cff648111c2a279488d77940c8d48b4b782..0a6fdf853eb3e6695d515727133b370dcec55513
--- 1/net/ceph/messenger.c
--- 2/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@@ -1450,11 -1530,11 +1530,11 @@@ static int process_connect(struct ceph_
                 * If we sent a smaller connect_seq than the peer has, try
                 * again with a larger value.
                 */
 -              dout("process_connect got RETRY my seq = %u, peer_seq = %u\n",
 +              dout("process_connect got RETRY_SESSION my seq %u, peer %u\n",
                     le32_to_cpu(con->out_connect.connect_seq),
 -                   le32_to_cpu(con->in_connect.connect_seq));
 -              con->connect_seq = le32_to_cpu(con->in_connect.connect_seq);
 +                   le32_to_cpu(con->in_reply.connect_seq));
 +              con->connect_seq = le32_to_cpu(con->in_reply.connect_seq);
-               ceph_con_out_kvec_reset(con);
+               con_out_kvec_reset(con);
                ret = prepare_write_connect(con);
                if (ret < 0)
                        return ret;
@@@ -1468,10 -1548,10 +1548,10 @@@
                 */
                dout("process_connect got RETRY_GLOBAL my %u peer_gseq %u\n",
                     con->peer_global_seq,
 -                   le32_to_cpu(con->in_connect.global_seq));
 +                   le32_to_cpu(con->in_reply.global_seq));
                get_global_seq(con->msgr,
 -                             le32_to_cpu(con->in_connect.global_seq));
 +                             le32_to_cpu(con->in_reply.global_seq));
-               ceph_con_out_kvec_reset(con);
+               con_out_kvec_reset(con);
                ret = prepare_write_connect(con);
                if (ret < 0)
                        return ret;