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

2015-06-12 Thread Michael Ellerman
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:

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

2015-06-12 Thread Michael Ellerman
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

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

2015-06-11 Thread Michael Ellerman
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