From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ingo Molnar <mingo@elte.hu>
Subject: Re: linux-next: manual merge of the sparseirq tree
Date: Thu, 16 Oct 2008 10:13:47 +0200
Message-ID: <20081016081346.GA17082@elte.hu>
References: <20081016190840.2e42a5a8.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-next-owner@vger.kernel.org>
Received: from mx3.mail.elte.hu ([157.181.1.138]:49309 "EHLO mx3.mail.elte.hu"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752536AbYJPIN4 (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Thu, 16 Oct 2008 04:13:56 -0400
Content-Disposition: inline
In-Reply-To: <20081016190840.2e42a5a8.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Ingo,
> 
> Today's linux-next merge of the sparseirq tree got a lot of conflicts 
> with various other trees.  For today, I will drop it and maybe have 
> another look tomorrow when things are (hopefully) less busy. [...]

okay, agreed - i've just reset auto-sparseirq-next to Linus and will 
update it with a merged up tree. (which we have in the works)

> [...] If you could fix up any internal-to-tip and Linus conflicts, 
> that would be great.

no other topic should be conflicting that i know of.

	Ingo