Hi all, Today's linux-next merge of the tip tree got a conflict in:
arch/arm/mach-shmobile/intc-sh73a0.c between commit: 30f8925a57d8 ("ARM: shmobile: Remove legacy board code for KZM-A9-GT") from the arm-soc tree and commit: 0d3f2c92e004 ("irqchip/gic: Remove redundant gic_set_irqchip_flags") from the tip tree. I fixed it up (I just removed the file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell s...@canb.auug.org.au -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/