Hi Stephen, On Mon, Sep 17, 2012 at 02:24:05AM +0100, Stephen Rothwell wrote: > After merging the arm64 tree, today's linux-next build () > failed like this: > > arch/powerpc/kernel/sys_ppc32.c:146:17: error: conflicting types for 'compat_sys_sendfile' > include/linux/compat.h:593:16: note: previous declaration of 'compat_sys_sendfile' was here > arch/powerpc/kernel/sys_ppc32.c:231:17: error: conflicting types for 'compat_sys_sched_rr_get_interval' > include/linux/compat.h:596:16: note: previous declaration of 'compat_sys_sched_rr_get_interval' was here > > Caused by commits 2a23f0dba0c6 ("fs: Add generic compat_sys_sendfile > implementation") and a0c6fc489bf6 ("compat: Add generic > compat_sys_sched_rr_get_interval implementation"). Grep is your friend. Thanks for this. It was an attempt to add generic compat_sys_sendfile() and compat_sys_sched_rr_get_interval() implementations to be shared by other architectures (patches for the other architectures to be pushed separately). I'll drop them for now as PowerPC has different prototypes and push the patches separately. -- Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html