linux-kernel - Re: linux-next: manual merge of the block 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] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110307224217.154735b4.sfr@canb.auug.org.au>
Date:	Mon, 7 Mar 2011 22:42:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	sedat.dilek@...il.com
Cc:	Sedat Dilek <sedat.dilek@...glemail.com>,
	Jens Axboe <axboe@...nel.dk>, Tejun Heo <tj@...nel.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the block tree with Linus' tree

Hi Sedat,

On Mon, 7 Mar 2011 12:25:23 +0100 Sedat Dilek <sedat.dilek@...glemail.com> wrote:
>
> No, I tried to merge your for-next into linux-next (which will happen
> with tomorrows linux-next).

No, it won't.  Each day I start with Linus' tree and merge all the other
trees.  Doing it the other way would lead to a real mess.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped