From: Christophe Saout <christophe@saout.de>
To: linux-kernel@vger.kernel.org
Cc: akpm@zip.com.au, torvalds@osdl.org
Subject: syscall clash: mknod64 / fadvise64_64
Date: Sat, 16 Aug 2003 13:14:28 +0200 [thread overview]
Message-ID: <1061032468.4198.2.camel@chtephan.cs.pocnet.net> (raw)
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
reply other threads:[~2003-08-16 11:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1061032468.4198.2.camel@chtephan.cs.pocnet.net \
--to=christophe@saout.de \
--cc=akpm@zip.com.au \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®