From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org,
Arjan van de Ven <arjan@infradead•org>,
Jeremy Fitzhardinge <jeremy@goop•org>
Subject: Re: linux-next: manual merge of the iommu tree
Date: Mon, 29 Dec 2008 13:15:01 +0100 [thread overview]
Message-ID: <20081229121501.GE9628@elte.hu> (raw)
In-Reply-To: <20081229230451.4e322cde.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Ingo,
>
> Today's linux-next merge of the iommu tree got a conflict in
> arch/x86/kernel/Makefile between commit
> b43d196c4d3fe46d6dda7c987c47792612b80b1b ("x86: corruption-check: some
> post-move cleanups") from Linus' tree and commit
> cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 ("x86: unify pci iommu setup and
> allow swiotlb to compile for 32 bit") from the iommu tree.
>
> Simply overlapping additions. I fixed it up (see below) and can carry
> the fix as necessary.
had a resolution for this cached from tip/master - so i just re-integrated
and re-pushed auto-iommu-next so it should go away next time you pick it
up. Thanks,
Ingo
next prev parent reply other threads:[~2008-12-29 12:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 12:04 linux-next: manual merge of the iommu tree Stephen Rothwell
2008-12-29 12:15 ` Ingo Molnar [this message]
2008-12-29 12:20 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 12:10 Stephen Rothwell
2009-01-06 5:57 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=20081229121501.GE9628@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=arjan@infradead$(echo .)org \
--cc=jeremy@goop$(echo .)org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/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