From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org,
Arjan van de Ven <arjan@infradead.org>,
Jeremy Fitzhardinge <jeremy@goop.org>
Subject: linux-next: manual merge of the iommu tree
Date: Mon, 29 Dec 2008 23:04:51 +1100 [thread overview]
Message-ID: <20081229230451.4e322cde.sfr@canb.auug.org.au> (raw)
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/Makefile
index 3d82c15,a9c656f..0000000
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -108,7 -105,7 +108,8 @@@ microcode-$(CONFIG_MICROCODE_INTEL) +=
microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o
obj-$(CONFIG_MICROCODE) += microcode.o
+obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
+ obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64
###
# 64 bit specific files
next reply other threads:[~2008-12-29 12:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-29 12:04 Stephen Rothwell [this message]
2008-12-29 12:15 ` linux-next: manual merge of the iommu tree Ingo Molnar
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=20081229230451.4e322cde.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arjan@infradead.org \
--cc=jeremy@goop.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
/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