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] [thread-next>] [day] [month] [year] [list]

Message-ID: <1331572403.1149.19.camel@fedora>
Date:	Mon, 12 Mar 2012 13:13:23 -0400
From:	Steven Rostedt <srostedt@...hat.com>
To:	Rob Lee <rob.lee@...aro.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	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

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.

-- Steve


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/