From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller 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: 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 ); 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: 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 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 :) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sunset.davemloft.net (unknown [74.93.104.97]) by ozlabs.org (Postfix) with ESMTP id 13F19DE0C7 for ; Tue, 1 Jul 2008 19:33:26 +1000 (EST) Date: Tue, 01 Jul 2008 02:33:25 -0700 (PDT) Message-Id: <20080701.023325.94704207.davem@davemloft.net> To: sfr@canb.auug.org.au Subject: Re: linux-next: manual merge of the net tree From: David Miller In-Reply-To: <20080701171940.6f282113.sfr@canb.auug.org.au> References: <20080701171940.6f282113.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Cc: linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org, paulus@samba.org, jgarzik@redhat.com, Jason.jin@freescale.com List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Stephen Rothwell 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 :)