* syscall clash: mknod64 / fadvise64_64
@ 2003-08-16 11:14 Christophe Saout
0 siblings, 0 replies; only message in thread
From: Christophe Saout @ 2003-08-16 11:14 UTC (permalink / raw)
To: linux-kernel; +Cc: akpm, torvalds
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@saout.de>
Please avoid sending me Word or PowerPoint attachments.
See http://www.fsf.org/philosophy/no-word-attachments.html
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2003-08-16 11:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-08-16 11:14 syscall clash: mknod64 / fadvise64_64 Christophe Saout
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).