From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org, David Woodhouse <dwmw2@infradead.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: Re: linux-next: manual merge of the x86 tree
Date: Sun, 14 Sep 2008 17:16:50 +0200 [thread overview]
Message-ID: <20080914151650.GA29290@elte.hu> (raw)
In-Reply-To: <20080912093751.f4a4314e.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the x86 tree got a conflict in
> drivers/pci/intel-iommu.c between commit
> cbda1ba898647aeb4ee770b803c922f595e97731 ("PCI/iommu: blacklist DMAR on
> Intel G31/G33 chipsets") from the pci-current tree and commit
> 2ae21010694e56461a63bfc80e960090ce0a5ed9 ("x64, x2apic/intr-remap:
> Interrupt remapping infrastructure") from the x86 tree.
>
> It was a bit difficult to see how to easily fix this up, so I have
> effectively reverted the pci-current commit for now (by using the x86
> version of the file) but, I assume, that commit will end up in Linus'
> tree soon so that the x86 guys can fix the conflict in their tree.
yep, i've done a more intelligent merge (keeping the pci tree changes)
and pushed the result out into tip/auto-x86-next.
Ingo
next prev parent reply other threads:[~2008-09-14 15:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-11 23:37 linux-next: manual merge of the x86 tree Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar [this message]
2008-09-14 18:11 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-10-14 2:23 Stephen Rothwell
2008-09-11 23:34 Stephen Rothwell
2008-09-14 15:18 ` Ingo Molnar
2008-09-14 18:13 ` Stephen Rothwell
2008-09-03 0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02 1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15 3:58 Stephen Rothwell
2008-07-31 2:59 Stephen Rothwell
2008-07-23 2:51 Stephen Rothwell
2008-07-18 2:29 Stephen Rothwell
2008-07-17 1:43 Stephen Rothwell
2008-07-15 2:26 Stephen Rothwell
2008-07-14 1:30 Stephen Rothwell
2008-07-11 1:48 Stephen Rothwell
2008-07-11 1:47 Stephen Rothwell
2008-07-08 0:56 Stephen Rothwell
2008-07-08 3:22 ` Jeremy Fitzhardinge
2008-07-08 5:01 ` Stephen Rothwell
2008-07-08 5:28 ` Jeremy Fitzhardinge
2008-07-08 5:39 ` Ingo Molnar
2008-07-08 0:52 Stephen Rothwell
2008-07-04 3:50 Stephen Rothwell
2008-07-04 3:41 Stephen Rothwell
2008-07-04 9:41 ` Ingo Molnar
2008-06-25 2:28 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=20080914151650.GA29290@elte.hu \
--to=mingo@elte.hu \
--cc=dwmw2@infradead.org \
--cc=hpa@zytor.com \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-next@vger.kernel.org \
--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.