linux-kernel - Re: linux-next: manual merge of the cpuidle-cons tree with the tip 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]

Date:	Tue, 13 Mar 2012 10:08:04 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Rostedt <srostedt@...hat.com>
Cc:	Rob Lee <rob.lee@...aro.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Subject: Re: linux-next: manual merge of the cpuidle-cons tree with the tip
 tree

Hi Rob,

On Mon, 12 Mar 2012 13:13:23 -0400 Steven Rostedt <srostedt@...hat.com> wrote:
>
> On Mon, 2012-03-12 at 12:06 -0500, Rob Lee wrote:
> 
> > 
> > Looks good to me as well.
> > 
> > Who should carry this fixup?
> 
> I think it's trivial enough that Linus can handle it. He always said
> that he likes to fix merge conflicts and has yelled at people who did
> things to prevent them.

Yeah, I just carry it in my tree and Linus will fix it up when he merges
the trees in his.

[The assumption is that anything I can figure out so can Linus :-)]
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped