From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Robert Richter <robert.richter@amd•com>,
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:13:41 +0200 [thread overview]
Message-ID: <20080825091341.GB9114@elte.hu> (raw)
In-Reply-To: <20080825190822.591685e5.sfr@canb.auug.org.au>
* 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.
Ingo
next prev parent reply other threads:[~2008-08-25 9:14 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 [this message]
2008-08-25 9:32 ` Robert Richter
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=20080825091341.GB9114@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=gorcunov@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robert.richter@amd$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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