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

[Sage Weil]

On Tue, 22 May 2012, Stephen Rothwell wrote:
> Hi Sage,
> 
> Today's linux-next merge of the ceph tree got a conflict in
> net/ceph/messenger.c between commit 95c961747284 ("net: cleanup unsigned
> to unsigned int") from Linus' tree and commit 57dac9d16209 ("ceph:
> messenger: use read_partial() in read_partial_message()") from the ceph
> tree.
> 
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, Stephen!  If there's an easier way to carry this in our tree, just 
let me know.

sage


> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc net/ceph/messenger.c
> index 36fa6bf,1a80907..0000000
> --- a/net/ceph/messenger.c
> +++ b/net/ceph/messenger.c
> @@@ -695,12 -698,12 +698,12 @@@ static void prepare_write_banner(struc
>   	set_bit(WRITE_PENDING, &con->state);
>   }
>   
> - static int prepare_write_connect(struct ceph_messenger *msgr,
> - 				 struct ceph_connection *con,
> - 				 int include_banner)
> + static int prepare_write_connect(struct ceph_connection *con)
>   {
>  -	unsigned global_seq = get_global_seq(con->msgr, 0);
>  +	unsigned int global_seq = get_global_seq(con->msgr, 0);
>   	int proto;
> + 	int auth_proto;
> + 	struct ceph_auth_handshake *auth;
>   
>   	switch (con->peer_name.type) {
>   	case CEPH_ENTITY_TYPE_MON:
> @@@ -1627,9 -1663,10 +1663,10 @@@ static int read_partial_message_bio(str
>   static int read_partial_message(struct ceph_connection *con)
>   {
>   	struct ceph_msg *m = con->in_msg;
> + 	int size;
> + 	int end;
>   	int ret;
> - 	int to, left;
>  -	unsigned front_len, middle_len, data_len;
>  +	unsigned int front_len, middle_len, data_len;
>   	bool do_datacrc = !con->msgr->nocrc;
>   	int skip;
>   	u64 seq;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/