From: Youquan Song <youquan.song@linux.intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: David Woodhouse <dwmw2@infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Song,
Youquan" <youquan.song@intel.com>,
Suresh Siddha <suresh.b.siddha@intel.com>,
Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the dwmw2-iommu tree with Linus' tree
Date: Wed, 25 May 2011 16:16:05 -0400 [thread overview]
Message-ID: <20110525201605.GA30842@linux-youquan.bj.intel.com> (raw)
In-Reply-To: <20110525130004.150c054f.sfr@canb.auug.org.au>
On Wed, May 25, 2011 at 01:00:04PM +1000, Stephen Rothwell wrote:
> Hi David,
>
> Today's linux-next merge of the dwmw2-iommu tree got a conflict in
> arch/x86/kernel/apic/apic.c between commit 31dce14a3269 ("x86, ioapic:
> Use ioapic_saved_data while enabling intr-remapping") from Linus' tree and
> commit 6a87c5ec6463 ("intel-iommu: enable x2apic opt out") from the
> dwmw2-iommu tree.
>
> I fixed it up (see below) and can carry the fix as necessary.
The fix looks good to me.
Thanks
-Youquan
next prev parent reply other threads:[~2011-05-25 8:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-25 3:00 linux-next: manual merge of the dwmw2-iommu tree with Linus' tree Stephen Rothwell
2011-05-25 9:16 ` Ingo Molnar
2011-05-25 10:57 ` David Woodhouse
2011-05-25 11:40 ` Ingo Molnar
2011-05-25 20:16 ` Youquan Song [this message]
2011-05-25 20:59 ` David Woodhouse
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=20110525201605.GA30842@linux-youquan.bj.intel.com \
--to=youquan.song@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=suresh.b.siddha@intel.com \
--cc=youquan.song@intel.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;
as well as URLs for NNTP newsgroup(s).