Subject: Re: linux-next: manual merg of x86 tree

From: Ingo Molnar <[email-masked]>
Date: Fri, 13 Jun 2008 06:39:30 +0200

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

> Hi all,
> 
> Today's linux-next merge of the x86 tree got a conflict involving 
> these commits:
> 
> 0b6a39f7ebcb1c82587ce35b401c513eed41ac5c ("Revert "x86: fix ioapic bug again"") from Linus' tree
> b61d37f073055f838b03c4ad5683a4d05bb95fbf ("Revert "x86: fix ioapic bug again"") from the x86 tree
> b697c77b2ce6f526abbe749afec51666b6a69f45 ("Revert "Revert "x86: fix ioapic bug again""") from the x86 tree
> 4b151813a40a968fce405ee561a321bea23f459c ("x86: I/O APIC: remove parameters to fiddle with the 8259A") from the x86 tree
> 
> I simply used the version of the file in the x86 tree.

thanks for the reporting - this conflict should go away on the next 
iteration of -tip (today-ish), when it will be merged up to 
linus-latest.

	Ingo