Messages in this thread | | | Date | Tue, 9 Jul 2013 20:57:15 -0700 (PDT) | From | Sage Weil <> | Subject | Re: linux-next: manual merge of the ceph tree with Linus' tree |
| |
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
| |