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

[Jason Cooper]

Stephen,

On Thu, Nov 27, 2014 at 04:57:19PM +1100, Stephen Rothwell wrote:
> Hi Jason,
> 
> Today's linux-next merge of the irqchip tree got a conflict in
> drivers/irqchip/Makefile between commit 8a19b8f19429 ("MIPS: Move GIC
> to drivers/irqchip/") from the mips tree and commit 5fe3bba3088c
> ("irqchip: mtk-sysirq: Add sysirq interrupt polarity support") from the
> irqchip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks!

thx,

Jason.
--
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/