linux-kernel - linux-next: manual merge of the l2-mtd tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <1434079626.1545.1.camel@ellerman.id.au>
Date:	Fri, 12 Jun 2015 13:27:06 +1000
From:	Michael Ellerman <mpe@...erman.id.au>
To:	Brian Norris <computersforpeace@...il.com>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rafał Miłecki <zajec5@...il.com>
Subject: linux-next: manual merge of the l2-mtd tree with the mips tree

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 <zajec5@...il.com>
 +L:    linux-mips@...ux-mips.org
 +S:    Maintained
 +F:    drivers/firmware/broadcom/*
 +
+ BROADCOM STB NAND FLASH DRIVER
+ M:    Brian Norris <computersforpeace@...il.com>
+ L:    linux-mtd@...ts.infradead.org
+ S:    Maintained
+ F:    drivers/mtd/nand/brcmnand/
+ 
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@...il.com>
  L:    linux-wireless@...r.kernel.org

cheers



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/