linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees

linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees

[Stephen Rothwell]

Hi Ingo,

Today's linux-next merge of the iommu tree got conflicts in
arch/x86/Kconfig between commits 2e9f3bddcbc711bb14d86c6f068a779bf3710247
("bzip2/lzma: make config machinery an arch configurable") from the x86
tree and 7df4b20d10108f0c1aa08ed3a7c0bfd9b9014562 ("kmemcheck: make
kconfig accessible for other architectures") from the kmemcheck tree and
commit 2118d0c548e8a2205e1a29eb5b89e5f2e9ae2c8b ("dma-debug: x86
architecture bindings") from the iommu tree.

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/Kconfig
index ca6bc8b,f2cb677..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -42,10 -40,7 +42,11 @@@ config X8
  	select HAVE_GENERIC_DMA_COHERENT if X86_32
  	select HAVE_EFFICIENT_UNALIGNED_ACCESS
  	select USER_STACKTRACE_SUPPORT
 +	select HAVE_KERNEL_GZIP
 +	select HAVE_KERNEL_BZIP2
 +	select HAVE_KERNEL_LZMA
 +	select HAVE_ARCH_KMEMCHECK
+ 	select HAVE_DMA_API_DEBUG
  
  config ARCH_DEFCONFIG
  	string

Re: linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

On Thu, 19 Mar 2009 19:06:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I fixed it up (see below) and can carry the fix as necessary.

This is, of course how it was fixed in tip/master as well.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: manual merge of the iommu tree with the kmemcheck/x86 trees

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> On Thu, 19 Mar 2009 19:06:53 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I fixed it up (see below) and can carry the fix as necessary.
> 
> This is, of course how it was fixed in tip/master as well.

yeah. This file is a common source of conflicts - eventually we will 
sort those kconfig variables alphabetically to reduce the chance of 
interaction.

	Ingo