lkml.org 
[lkml]   [2013]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: 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


\
 
 \ /
  Last update: 2013-07-10 23:47    [W:0.034 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site