* linux-next: manual merg of x86 tree
@ 2008-06-13 3:32 Stephen Rothwell
2008-06-13 4:39 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-13 3:32 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 688 bytes --]
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.
--
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] 3+ messages in thread
* Re: linux-next: manual merg of x86 tree
2008-06-13 3:32 linux-next: manual merg of x86 tree Stephen Rothwell
@ 2008-06-13 4:39 ` Ingo Molnar
2008-06-13 5:50 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2008-06-13 4:39 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Thomas Gleixner, H. Peter Anvin, linux-next
* Stephen Rothwell <sfr@canb•auug.org.au> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merg of x86 tree
2008-06-13 4:39 ` Ingo Molnar
@ 2008-06-13 5:50 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2008-06-13 5:50 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Thomas Gleixner, H. Peter Anvin, linux-next
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
Hi Ingo,
On Fri, 13 Jun 2008 06:39:30 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> 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.
Great, 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] 3+ messages in thread
end of thread, other threads:[~2008-06-13 5:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-13 3:32 linux-next: manual merg of x86 tree Stephen Rothwell
2008-06-13 4:39 ` Ingo Molnar
2008-06-13 5:50 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox