From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752695AbbFLKua (ORCPT ); Fri, 12 Jun 2015 06:50:30 -0400 Received: from ozlabs.org ([103.22.144.67]:52950 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750893AbbFLKu2 (ORCPT ); Fri, 12 Jun 2015 06:50:28 -0400 Message-ID: <1434106220.20648.1.camel@ellerman.id.au> Subject: linux-next: manual merge of the l2-mtd tree with the mips tree From: Michael Ellerman To: Brian Norris , Ralf Baechle Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?Q?Rafa=C5=82_Mi=C5=82ecki?= Date: Fri, 12 Jun 2015 20:50:20 +1000 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. I fixed it up (see below) and can carry the fix as necessary (no action is required). diff --cc MAINTAINERS index 85dc5bd76c38,ad9f36875372..d848473e184f --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2320,12 -2257,12 +2320,18 @@@ S: Supporte F: drivers/gpio/gpio-bcm-kona.c F: Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt +BROADCOM NVRAM DRIVER +M: Rafał Miłecki +L: linux-mips@linux-mips.org +S: Maintained +F: drivers/firmware/broadcom/* + + BROADCOM STB NAND FLASH DRIVER + M: Brian Norris + L: linux-mtd@lists.infradead.org + S: Maintained + F: drivers/mtd/nand/brcmnand/ + BROADCOM SPECIFIC AMBA DRIVER (BCMA) M: Rafał Miłecki L: linux-wireless@vger.kernel.org cheers