From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org
Subject: linux-next: manual merge of the oprofile tree
Date: Sat, 13 Sep 2008 10:06:20 +1000 [thread overview]
Message-ID: <20080913100620.bff0cb7c.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
Hi Ingo,
Today's linux-next merge of the oprofile tree got a conflict in
arch/x86/oprofile/nmi_int.c between commit
0329693bf72584efd84dde19997ee4f0c54f8d57 ("Merge branch 'linus' into
irq/sparseirq") from the timers tree and commit
424bf62df64003f35ce8941494dcfe7ab61376b3 ("manual merge of oprofile")
from the oprofile tree.
The former merge added two declarations twice. I just removed the extras.
--
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-09-13 0:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-13 0:06 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-08-25 9:08 linux-next: manual merge of the oprofile tree Stephen Rothwell
2008-08-25 9:13 ` Ingo Molnar
2008-08-25 9:32 ` Robert Richter
2008-08-25 14:34 ` Cyrill Gorcunov
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=20080913100620.bff0cb7c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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