2003-08-16 11:14:33

by Christophe Saout

[permalink] [raw]
Subject: syscall clash: mknod64 / fadvise64_64

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 <[email protected]>
Please avoid sending me Word or PowerPoint attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html