From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Miller <davem@davemloft.net>
Subject: Re: linux-next: manual merge of the net tree
Date: Tue, 01 Jul 2008 02:33:25 -0700 (PDT)
Message-ID: <20080701.023325.94704207.davem@davemloft.net>
References: <20080701171940.6f282113.sfr@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Return-path: <linux-next-owner@vger.kernel.org>
Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:41827
	"EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK)
	by vger.kernel.org with ESMTP id S1759187AbYGAJdZ (ORCPT
	<rfc822;linux-next@vger.kernel.org>); Tue, 1 Jul 2008 05:33:25 -0400
In-Reply-To: <20080701171940.6f282113.sfr@canb.auug.org.au>
Sender: linux-next-owner@vger.kernel.org
List-ID: <linux-next.vger.kernel.org>
To: sfr@canb.auug.org.au
Cc: linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org, paulus@samba.org, Jason.jin@freescale.com, jgarzik@redhat.com

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Jul 2008 17:19:40 +1000

> Today's linux-next merge of the net tree got a conflict
...

Thanks for the heads up on these two conflicts with the
powerpc tree.

The best seems to let you keep using your resolving, so
that's what I'll let you do :)