From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org
Subject: Re: linux-next: manual merg of x86 tree
Date: Fri, 13 Jun 2008 06:39:30 +0200 [thread overview]
Message-ID: <20080613043929.GA5427@elte.hu> (raw)
In-Reply-To: <20080613133240.b8e527b7.sfr@canb.auug.org.au>
* 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
next prev parent reply other threads:[~2008-06-13 4:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-13 3:32 linux-next: manual merg of x86 tree Stephen Rothwell
2008-06-13 4:39 ` Ingo Molnar [this message]
2008-06-13 5:50 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080613043929.GA5427@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox