From: Steven Rostedt <srostedt@redhat.com>
To: Rob Lee <rob.lee@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the cpuidle-cons tree with the tip tree
Date: Mon, 12 Mar 2012 13:13:23 -0400 [thread overview]
Message-ID: <1331572403.1149.19.camel@fedora> (raw)
In-Reply-To: <CAMXH7KHdfzjZCsBMkFOnwYtyaqBztMY99QcZ7VwLP0JASUiVAw@mail.gmail.com>
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
next prev parent reply other threads:[~2012-03-12 17:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 7:40 linux-next: manual merge of the cpuidle-cons tree with the tip tree Stephen Rothwell
2012-03-09 13:35 ` Steven Rostedt
2012-03-12 17:06 ` Rob Lee
2012-03-12 17:13 ` Steven Rostedt [this message]
2012-03-12 23:08 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331572403.1149.19.camel@fedora \
--to=srostedt@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rob.lee@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).