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

Mon, 30 Jul 2012 18:59:35 -0700 

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 ab166d5aa3bc ("libceph: separate
banner and connect writes") from the ceph tree.

I fixed it up (removed the calls to ceph_con_out_kvec_reset()) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

Attachment: pgpTroELdxT9c.pgp
Description: PGP signature

Reply via email to