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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20120111140218.269abb02376954da5ef09a81@canb.auug.org.au>
Date:	Wed, 11 Jan 2012 14:02:18 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Sage Weil <sage@...dream.net>
Cc:	Al Viro <viro@...IV.linux.org.uk>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Alex Elder <elder@...amhost.com>
Subject: Re: linux-next: manual merge of the ceph tree with Linus' tree

Hi Sage,

On Tue, 10 Jan 2012 17:35:36 -0800 (PST) Sage Weil <sage@...dream.net> 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@...b.auug.org.au

Content of type "application/pgp-signature" skipped