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

From: Michael Ellerman
Date: Fri Jun 12 2015 - 06:58:06 EST

Next message: Peter Zijlstra: "Re: [PATCH 1/1] cputime: Make the reported utime+stime correspond to the actual runtime."
Previous message: Sudeep Holla: "Re: [PATCH v2 1/1] irqchip: exynos-combiner: Save IRQ enable set on suspend"
In reply to: Michael Ellerman: "linux-next: manual merge of the l2-mtd tree with the mips tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

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

Next message: Peter Zijlstra: "Re: [PATCH 1/1] cputime: Make the reported utime+stime correspond to the actual runtime."
Previous message: Sudeep Holla: "Re: [PATCH v2 1/1] irqchip: exynos-combiner: Save IRQ enable set on suspend"
In reply to: Michael Ellerman: "linux-next: manual merge of the l2-mtd tree with the mips tree"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]