From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sage Weil Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree Date: Mon, 21 May 2012 20:58:05 -0700 (PDT) Message-ID: References: <20120522114516.2c419f43a0826e9e78f8b3c0@canb.auug.org.au> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: In-Reply-To: <20120522114516.2c419f43a0826e9e78f8b3c0@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet , "David S. Miller" , elder@inktank.com List-Id: linux-next.vger.kernel.org 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@canb.auug.org.au > > 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; >