From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [GIT PULL] timer changes for v3.10
Date: Thu, 2 May 2013 12:22:05 +0200 (CEST) [thread overview]
Message-ID: <alpine.LFD.2.02.1305021221180.3972@ionos> (raw)
In-Reply-To: <CA+55aFwaQMjKDV5aA=_2mNiF1msGZO2hX3gypCZTByzDZxX6DQ@mail.gmail.com>
On Tue, 30 Apr 2013, Linus Torvalds wrote:
> Both sets of patches were done by Thomas, and I *really* want you guys
> to take a look at my conflict resolution. I effectively moved the new
> "don't go into deep idle if boradcast timer is pending" check from x86
> and arm into the generic idle loop. So my merge resolution is
> semantically quite different from either branch, but the alternative
> seemed to be to remove the new check entirely.
>
> I pushed my merge out, please take a look.
Perfect!
tglx
next prev parent reply other threads:[~2013-05-02 10:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 7:43 Ingo Molnar
2013-04-30 15:21 ` Linus Torvalds
2013-05-01 10:53 ` Ingo Molnar
2013-05-02 10:22 ` Thomas Gleixner [this message]
2013-05-06 23:01 ` Pavel Machek
2013-05-07 0:10 ` John Stultz
[not found] ` <CA++bM2scosWgBpC3_LzcKYOjG4EQQzN5Vf4rZFds-5qRVRwvDQ@mail.gmail.com>
2013-05-07 2:38 ` Fwd: " Feng Tang
2013-05-07 6:53 ` Ingo Molnar
2013-05-07 7:05 ` Feng Tang
2013-05-07 16:01 ` John Stultz
2013-05-07 17:18 ` Ingo Molnar
2013-05-07 21:31 ` Pavel Machek
2013-05-07 21:39 ` John Stultz
2013-05-07 21:51 ` Pavel Machek
2013-05-08 6:44 ` Ingo Molnar
2013-05-08 10:55 ` Pavel Machek
2013-05-08 14:11 ` Feng Tang
2013-05-08 14:34 ` Thomas Gleixner
2013-05-08 19:49 ` Pavel Machek
2013-05-09 8:59 ` Ingo Molnar
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=alpine.LFD.2.02.1305021221180.3972@ionos \
--to=tglx@linutronix.de \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=torvalds@linux-foundation.org \
/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
Powered by JetHome