On 06/21/2013 10:05 AM, Stephen Boyd wrote:
On 06/21, Arnd Bergmann wrote:This causes build failures when doing a simple merge with the arm-soc tree: ==> build/clps711x_defconfig/faillog <== /git/arm-soc/arch/arm/mach-clps711x/common.c:37:29: fatal error: asm/sched_clock.h: No such file or directory #include <asm/sched_clock.h> ^ ==> build/imx_v6_v7_defconfig/faillog <== /git/arm-soc/drivers/clocksource/vf_pit_timer.c:15:29: fatal error: asm/sched_clock.h: No such file or directory #include <asm/sched_clock.h> How about adding back a temporary arch/arm/include/asm/sched_clock.h that only contains "#include <linux/sched_clock.h>" so we can change those two files after the merge and still get a bisectible history?Sounds fine. John can you add this patch on top?
Thanks. I've queued this and will send it on to Thomas here shortly. thanks -john -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
