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

From: Ingo Molnar <[email-masked]>
Date: Thu, 19 Mar 2009 09:43:43 +0100

* Stephen Rothwell <[email-masked]> wrote:

> On Thu, 19 Mar 2009 19:06:53 +1100 Stephen Rothwell <[email-masked]> 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