Date: Fri, 2 Jan 2009 12:06:33 -0800 (PST)
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Rusty Russell <rusty@rustcorp.com.au>
cc: Mike Travis <travis@sgi.com>, Ingo Molnar <mingo@elte.hu>,
       linux-kernel@vger.kernel.org
Subject: Re: [PULL] cpumask tree
In-Reply-To: <200901011149.18401.rusty@rustcorp.com.au>
Message-ID: <alpine.LFD.2.00.0901021149020.5086@localhost.localdomain>
References: <200901011149.18401.rusty@rustcorp.com.au>
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
Content-Length: 886
Lines: 22


On Thu, 1 Jan 2009, Rusty Russell wrote:
>
> OK, this is the bulk of the conversion to the new cpumask operators.
> The x86-specific parts (the most aggressive large-NR_CPUS arch) are going
> via Ingo's tree.

This gets lots of conflicts for me. Some of them look simple enough, but 
not all. io_apic.c gets lots of nasty conflicts, and it _looks_ like I 
should just pick the version of the file that I already have (because the 
only thing that comes in from that is yet another merge commit), but 
kernel/sched.c also gets conflicts in areas with FIXME's etc.

Rusty, Ingo, can you work this out? I pushed out my current tree.

		Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/