Re: linux-next: manual merge of the ceph tree with Linus' tree

[Stephen Rothwell]

Hi Sage,

On Tue, 10 Jan 2012 17:35:36 -0800 (PST) Sage Weil <sage@xxxxxxxxxxxx> wrote:
>
> BTW, should I let Linus resolve this, or merge his master back into my 
> tree, or rebase onto his master?

Let Linus resolve it (giving him a hint if necessary).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature