From: Ingo Molnar <mingo@elte.hu>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: [git pull, take 2] x86 updates for v2.6.28, phase #4, x2apic, unify-cpu-detect
Date: Sat, 11 Oct 2008 20:18:57 +0200 [thread overview]
Message-ID: <20081011181857.GA20554@elte.hu> (raw)
In-Reply-To: <alpine.LFD.2.00.0810111108060.3402@nehalem.linux-foundation.org>
* Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>
> On Fri, 10 Oct 2008, Ingo Molnar wrote:
> >
> > Please pull the latest x86-v28-for-linus-phase4-B git tree from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-v28-for-linus-phase4-B
>
> This is broken.
>
> I get an absolute metric shitload of:
>
> include/asm/dma-mapping.h:309:2: error: #endif without #if
>
> errors, and I suspect it's because of some broken merge resolution
> that you didn't even test and then fixed in some later branch.
possible - i tested the first series at all 10 merge points for 3 days.
and indeed the problem is not there in the old, x86-v28-for-linus-phase4
branch.
> I double-checked: it's already broken in your tree, it's not from my
> merge (ie commit 0d4ab8b5aa74f6be4d022dcf5e27845b7c290294 is already
> showing that bug).
>
> Not pulled.
indeed:
#endif
#endif /* ASM_X86__DMA_MAPPING_H */
that goes away in x86-v28-for-linus-phase6-B.
Ingo
next prev parent reply other threads:[~2008-10-11 18:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-10 0:04 [git pull] x86 updates for v2.6.28, phase #4, x2apic, unify-cpu-detect Ingo Molnar
2008-10-10 17:56 ` [git pull, take 2] " Ingo Molnar
2008-10-10 18:02 ` [git pull, take 2, part " Ingo Molnar
2008-10-11 18:12 ` [git pull, take " Linus Torvalds
2008-10-11 18:18 ` Ingo Molnar [this message]
2008-10-11 18:34 ` [git pull, take 3] " Ingo Molnar
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=20081011181857.GA20554@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.