* linux-next: manual merge of the iommu tree
@ 2008-12-29 12:04 Stephen Rothwell
2008-12-29 12:15 ` Ingo Molnar
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2008-12-29 12:04 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Arjan van de Ven, Jeremy Fitzhardinge
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the iommu tree
@ 2008-12-29 12:10 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2008-12-29 12:10 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Jeremy Fitzhardinge, Arjan van de Ven
Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
arch/x86/mm/init_32.c between commit
304e629bf4a3150a0bf6556fc45c52c5c082340f ("x86: corruption check: run the
corruption checks from a work queue") from Linus' tree and commit
cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8 ("x86: unify pci iommu setup and
allow swiotlb to compile for 32 bit") from the iommu tree.
Just overlapping removal/addition. I fixed it up (see below) and can
carry the fix as necessay.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/mm/init_32.c
index bdcbe2c,2b4b14f..0000000
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@@ -969,6 -970,10 +970,8 @@@ void __init mem_init(void
int codesize, reservedpages, datasize, initsize;
int tmp;
- start_periodic_check_for_corruption();
-
+ pci_iommu_alloc();
+
#ifdef CONFIG_FLATMEM
BUG_ON(!mem_map);
#endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the iommu tree
2008-12-29 12:04 linux-next: manual merge of the iommu tree Stephen Rothwell
@ 2008-12-29 12:15 ` Ingo Molnar
2008-12-29 12:20 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Ingo Molnar @ 2008-12-29 12:15 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, Arjan van de Ven, Jeremy Fitzhardinge
* 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the iommu tree
2008-12-29 12:15 ` Ingo Molnar
@ 2008-12-29 12:20 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2008-12-29 12:20 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Arjan van de Ven, Jeremy Fitzhardinge
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
Hi Ingo,
On Mon, 29 Dec 2008 13:15:01 +0100 Ingo Molnar <mingo@elte•hu> wrote:
>
> 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,
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the iommu tree
@ 2009-01-06 5:57 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2009-01-06 5:57 UTC (permalink / raw)
To: Ingo Molnar; +Cc: linux-next, Jesper Juhl, Becky Bruce, Jeremy Fitzhardinge
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hi Ingo,
Today's linux-next merge of the iommu tree got a conflict in
lib/swiotlb.c between commit 52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c
("swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c") from
the tip-core tree and commit fb05a37929e0cd99016b4f5e5a5ef077fb10a947
("swiotlb: add support for systems with highmem") from the iommu tree.
Just trivial overlapping add/removal of header includes. I fixed it up
and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-01-06 5:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-29 12:04 linux-next: manual merge of the iommu tree Stephen Rothwell
2008-12-29 12:15 ` 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox