linux-kernel - Re: linux-next: manual merge of the percpu 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: <20090907202420.c0bd57e5.sfr@canb.auug.org.au>
Date:	Mon, 7 Sep 2009 20:24:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
Cc:	Rusty Russell <rusty@...tcorp.com.au>,
	Christoph Lameter <cl@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the percpu tree with Linus' tree

Hi Tejun,

On Mon, 07 Sep 2009 17:36:56 +0900 Tejun Heo <tj@...nel.org> wrote:
>
> Stephen Rothwell wrote:
> > 
> > I *think* the changes in the percpu tree supercede those in Linus' tree,
> > so I have used those.
> 
> Yes, the changes in Linus's tree are backported from devel branch but
> the devel already has moved on and dropped one of the changes.  I'll
> merge Linus's tree into percpu devel branch.

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped