linux-next: manual merge of the ceph tree with Linus' tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Sage,

Today's linux-next merge of the ceph tree got a conflict in
net/ceph/messenger.c between commit 5bdca4e0768d ("libceph: fix messenger
retry") from Linus' tree and commit e22004235a90 ("libceph: rename
kvec_reset and kvec_add functions") from the ceph tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/ceph/messenger.c
index 10255e8,23073cf..0000000
--- a/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;

Attachment: pgptnG8MZmi5Q.pgp
Description: PGP signature