From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932841AbYJKSNw (ORCPT ); Sat, 11 Oct 2008 14:13:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932673AbYJKSNi (ORCPT ); Sat, 11 Oct 2008 14:13:38 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:56260 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932678AbYJKSNi (ORCPT ); Sat, 11 Oct 2008 14:13:38 -0400 Date: Sat, 11 Oct 2008 11:12:50 -0700 (PDT) From: Linus Torvalds To: Ingo Molnar cc: linux-kernel@vger.kernel.org, Andrew Morton , Thomas Gleixner , "H. Peter Anvin" Subject: Re: [git pull, take 2] x86 updates for v2.6.28, phase #4, x2apic, unify-cpu-detect In-Reply-To: <20081010175613.GA20112@elte.hu> Message-ID: References: <20081010000408.GA5970@elte.hu> <20081010175613.GA20112@elte.hu> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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. Linus