linux-kernel - Re: [GIT PULL] timer changes for v3.10

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: <CA+55aFwaQMjKDV5aA=_2mNiF1msGZO2hX3gypCZTByzDZxX6DQ@mail.gmail.com>
Date:	Tue, 30 Apr 2013 08:21:42 -0700
From:	Linus Torvalds <torvalds@...ux-foundation.org>
To:	Ingo Molnar <mingo@...nel.org>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [GIT PULL] timer changes for v3.10

On Tue, Apr 30, 2013 at 12:43 AM, Ingo Molnar <mingo@...nel.org> wrote:
>
> Please pull the latest timers-core-for-linus git tree from:
>
>    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus

Hmm.. The "Use generic idle loop" patches from the SMP/hotplug pull
conflicted with the "Use tick broadcast expired check" patches in this
one for both x86 and ARM.

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.

                      Linus
--
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/