From: Ingo Molnar <mingo@elte.hu>
To: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>,
x86@kernel.org, linux-kernel@vger.kernel.org,
Suresh Siddha <suresh.b.siddha@intel.com>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Zachary Amsden <zach@vmware.com>
Subject: Re: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives
Date: Fri, 18 Jul 2008 23:03:48 +0200 [thread overview]
Message-ID: <20080718210348.GB24373@elte.hu> (raw)
In-Reply-To: <86802c440807181001h4426c197vc474f81497a5b42@mail.gmail.com>
* Yinghai Lu <yhlu.kernel@gmail.com> wrote:
> > git merge tip/x86/x2apic
> CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
> CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
> CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> CONFLICT (content): Merge conflict in arch/x86/kernel/vmi_32.c
> CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
> CONFLICT (content): Merge conflict in include/asm-x86/apic.h
> CONFLICT (content): Merge conflict in include/asm-x86/paravirt.h
that's due to the changes in tip/x86/apic and in tip/x86/uv.
ok, i've just merged x86/apic into x86/x2apic and x86/uv as well, and
pushed out the result.
Note: it's a first raw merge and completely untested. It will now merge
cleanly into tip/master. There are probably a few details missing.
The smp-alternatives based trick that Maciej applied for write-around
can stay in the mem_apic_* methods - modern APICs do not need any
workaround in this area and can just use apic_ops.
> also please apply
> Fix VMI apic_ops.
> from Suresh
>
> to x2apic
done.
Ingo
next prev parent reply other threads:[~2008-07-18 21:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 18:15 Maciej W. Rozycki
2008-07-18 10:52 ` Ingo Molnar
2008-07-18 16:25 ` Yinghai Lu
2008-07-18 17:01 ` Yinghai Lu
2008-07-18 21:03 ` Ingo Molnar [this message]
2008-07-18 21:13 ` Yinghai Lu
2008-07-18 22:02 ` Maciej W. Rozycki
2008-07-18 22:42 ` Zachary Amsden
2008-07-18 22:49 ` Suresh Siddha
2008-07-18 22:51 ` Yinghai Lu
2008-07-18 23:00 ` Suresh Siddha
2008-07-18 23:04 ` Yinghai Lu
2008-07-18 23:18 ` Suresh Siddha
2008-07-19 21:49 ` Ingo Molnar
2008-07-19 21:53 ` Ingo Molnar
2008-07-20 12:08 ` Ingo Molnar
2008-07-20 15:04 ` Ingo Molnar
2008-07-21 17:59 ` Suresh Siddha
2008-07-22 13:24 ` Yong Wang
2008-07-22 13:48 ` Ingo Molnar
2008-07-18 23:43 ` Zachary Amsden
2008-07-19 21:43 ` Ingo Molnar
2008-07-18 22:58 ` Suresh Siddha
2008-07-19 21:47 ` Ingo Molnar
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=20080718210348.GB24373@elte.hu \
--to=mingo@elte.hu \
--cc=jeremy@goop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=suresh.b.siddha@intel.com \
--cc=x86@kernel.org \
--cc=yhlu.kernel@gmail.com \
--cc=zach@vmware.com \
/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
all inboxes | Powered by JetHome®