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 S1753164AbbFLK6D (ORCPT <rfc822;w@1wt.eu>);
	Fri, 12 Jun 2015 06:58:03 -0400
Received: from ozlabs.org ([103.22.144.67]:50917 "EHLO ozlabs.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752847AbbFLK6B (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 12 Jun 2015 06:58:01 -0400
Message-ID: <1434106679.20648.3.camel@ellerman.id.au>
Subject: Re: linux-next: manual merge of the l2-mtd tree with the mips tree
From: Michael Ellerman <mpe@ellerman.id.au>
To: Brian Norris <computersforpeace@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        =?UTF-8?Q?Rafa=C5=82_Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Fri, 12 Jun 2015 20:57:59 +1000
In-Reply-To: <1434106220.20648.1.camel@ellerman.id.au>
References: <1434106220.20648.1.camel@ellerman.id.au>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, 2015-06-12 at 20:50 +1000, Michael Ellerman wrote:
> Hi Brian,
> 
> Today's linux-next merge of the l2-mtd tree got a conflict in MAINTAINERS
> between commit 68c2d21d0126 "MIPS: BCM47xx: Move NVRAM driver to the
> drivers/firmware/" from the mips tree and commit 02787daadbda "MAINTAINERS: add
> entry for new brcmnand/ directory" from the l2-mtd tree.

Gah sorry, sent this twice. Ignore this one.

cheers