On Wed, 10 Jul 2013, Stephen Rothwell wrote: > 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.
Fixed, thanks! sage -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
