From: Robert Richter <robert.richter@amd.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, Cyrill Gorcunov <gorcunov@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: linux-next: manual merge of the oprofile tree
Date: Mon, 25 Aug 2008 11:32:38 +0200 [thread overview]
Message-ID: <20080825093237.GG14103@erda.amd.com> (raw)
In-Reply-To: <20080825091341.GB9114@elte.hu>
On 25.08.08 11:13:41, Ingo Molnar wrote:
>
> * Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Hi Ingo,
> >
> > Today's linux-next merge of the oprofile tree got a conflict in
> > arch/x86/kernel/apic_32.c between commit
> > 274cfe5912eebe9d4e1a4c451fe617289a181fcf ("x86: apic - rearrange
> > functions and comments") from the x86 tree and commits
> > 286f571837ba9d67625afd015366d79345abb414 ("x86: apic_*.c: add description
> > to AMD's extended LVT functions"),
> > 09691616850b3614dfb44790e1e1419b6a7f5d13 ("x86: apic: export symbols for
> > extended interrupt LVT functions") and
> > 6aa360e6c16c145edf1837690e0f7aaea6b86ef3 ("x86: apic: changing export
> > symbols to *_GPL") from the oprofile tree.
> >
> > The former moved some code that was updated by the latter. I fixed it
> > up (see below) and can carry it.
>
> thanks Stephen - conflict resolution looks good to me.
Looks good to me too.
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
email: robert.richter@amd.com
next prev parent reply other threads:[~2008-08-25 9:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2008-08-25 14:34 ` Cyrill Gorcunov
-- strict thread matches above, loose matches on Subject: below --
2008-09-13 0:06 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=20080825093237.GG14103@erda.amd.com \
--to=robert.richter@amd.com \
--cc=gorcunov@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.