* linux-next: x86 merge conflicts
@ 2008-06-11 2:59 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2008-06-11 2:59 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
Hi all,
Today;s linux-next merge of the x86 tree got conflicts in
arch/x86/kernel/process_32.c and arch/x86/kernel/process_64.c between
commits 6cd8a4bb2f97527a9ceb30bc77ea4e959c6a95e3 ("ftrace: trace preempt
off critical timings") and 81d68a96a39844853b37f20cc8282d9b65b78ef3
("ftrace: trace irq disabled critical timings") from the ftrace tree and
commit 6ddd2a27948f0bd02a2ad001e8a6816898eba0dc ("x86: simplify idle
selection") from the x86 tree.
I did the obvious (to me) fixup of replacing "idle()" with "pm_idle()" in
the ftrace versions.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-11 2:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-11 2:59 linux-next: x86 merge conflicts Stephen Rothwell
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).