syscall clash: mknod64 / fadvise64_64

[Christophe Saout]

Hi!

I just updated the sources via bkcvs and got the following clash with
the mknod64 patch from Andrews's -mm tree:

include/asm/unistd.h

#define __NR_tgkill     270
#define __NR_utimes     271
<<<<<<< unistd.h
#define __NR_mknod64    272
=======
#define __NR_fadvise64_64  272
>>>>>>> 1.32
                                                                                
#define NR_syscalls 273

--
Christophe Saout <christophe@xxxxxxxx>
Please avoid sending me Word or PowerPoint attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html

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