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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> On Thu, 19 Mar 2009 19:06:53 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux