From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-next@vger.kernel.org, Jason Yeh <jason.yeh@amd.com>
Subject: linux-next: manual merge of the timers tree
Date: Tue, 14 Oct 2008 16:51:56 +1100 [thread overview]
Message-ID: <20081014165156.7c24eecc.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 682 bytes --]
Hi all,
Today's linux-next merge of the timers tree got a conflict in
arch/x86/oprofile/nmi_int.c between commit
accba5f3965d6a9d1bf7c1e1a7995d17e9d521b6 ("Merge branch 'linus' into
oprofile-v2") from Linus' tree and commit
1a960b402a51d80abf54e3f8e4972374ffe5f22d ("Oprofile Multiplexing Patch")
from the timers tree.
Also, it looks like commit 0329693bf72584efd84dde19997ee4f0c54f8d57
("Merge branch 'linus' into irq/sparseirq") in the timers tree is a bad
merge and causes anothe conflict with Linus' tree.
I fixed them up using the obvious bits of each.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-14 7:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 5:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 2:02 linux-next: manual merge of the timers tree Stephen Rothwell
2008-10-21 1:43 Stephen Rothwell
2008-10-21 12:15 ` Ingo Molnar
2008-10-21 12:18 ` Stephen Rothwell
2008-10-14 6:12 Stephen Rothwell
2008-10-14 6:03 Stephen Rothwell
2008-10-14 5:59 Stephen Rothwell
2008-09-12 7:10 Stephen Rothwell
2008-09-12 6:57 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=20081014165156.7c24eecc.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=jason.yeh@amd.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--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