2013-07-10 01:24:22

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: manual merge of the ceph tree with Linus' tree

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 [email protected]

Attachments:
(No filename) (390.00 B)
 (No filename) (836.00 B)
 Download all attachments

2013-07-10 03:57:17

by Sage Weil

[permalink] [raw]
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