From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752457AbbC0E5D (ORCPT <rfc822;w@1wt.eu>);
	Fri, 27 Mar 2015 00:57:03 -0400
Received: from mail-gw2-out.broadcom.com ([216.31.210.63]:35899 "EHLO
	mail-gw2-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751105AbbC0E5A convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 27 Mar 2015 00:57:00 -0400
X-IronPort-AV: E=Sophos;i="5.11,477,1422950400"; 
   d="scan'208";a="60534509"
From: Scott Branden <sbranden@broadcom.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Rob Herring <robherring2@gmail.com>, Ralf Baechle <ralf@linux-mips.org>,
        "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Kevin Cernekee <cernekee@gmail.com>
Subject: Re: linux-next: manual merge of the dt-rh tree with the mips tree
Thread-Topic: linux-next: manual merge of the dt-rh tree with the mips tree
Thread-Index: AQHQaEYukTq9hA44P0eSdfouWgBfRZ0vxFxZ
Date: Fri, 27 Mar 2015 04:56:58 +0000
Message-ID: <C0EDB62B-3B1F-49D9-9E9F-75101B978339@broadcom.com>
References: <20150327152536.23f0a8b8@canb.auug.org.au>
In-Reply-To: <20150327152536.23f0a8b8@canb.auug.org.au>
Accept-Language: en-CA, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Rob,

Apologies that the mips tree is deleting files that I was synchronizing names on.  Would you like me to provide new patch that doesn't touch files that mips tree is now deleting?

Scott

> On Mar 26, 2015, at 9:26 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> <mime-attachment>