Hi Sage, Today's linux-next merge of the ceph tree got conflicts in drivers/block/rbd.c and net/ceph/osd_client.c because the ceph tree was rebased before being sent to Linus and it looks like one patch was dropped and several more added. I just used the upstream version of the cpeh tree for today - please clean up. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpiI3JMqPSV1.pgp
Description: PGP signature
