From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alasdair G Kergon <agk@redhat.com>
Subject: Re: linux-next: manual merge of the device-mapper tree
Date: Wed, 31 Dec 2008 01:27:54 +0000
Message-ID: <20081231012754.GC11060@agk.fab.redhat.com>
References: <20081215115823.dc3029d5.sfr@canb.auug.org.au> <20081231112249.4a0b68b2.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 mx2.redhat.com ([66.187.237.31]:49496 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751727AbYLaB2S (ORCPT <rfc822;linux-next@vger.kernel.org>);
	Tue, 30 Dec 2008 20:28:18 -0500
Content-Disposition: inline
In-Reply-To: <20081231112249.4a0b68b2.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, Ingo Molnar <mingo@elte.hu>, Kiyoshi Ueda <k-ueda@ct.jp.nec.com>

On Wed, Dec 31, 2008 at 11:22:49AM +1100, Stephen Rothwell wrote:
> This conflict is now between the device-mapper tree and Linus' tree.

Ta - I'll sort it when I rebase after the Xmas/New Year break.

Alasdair
-- 
agk@redhat.com