GNU C Library master sources branch, master, updated. glibc-2.12-112-g004c737

[drepper@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  004c737f7b097026c4231fbc3644e9450f9e087e (commit)
       via  1c06ba3100847da6bd1f2e011dc24fa8debd9615 (commit)
       via  93f17abfb514375ce7e2dff4e7c53842359fbc17 (commit)
      from  1feccb6caf8b324e67d6becebbe445af1a3b0847 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=004c737f7b097026c4231fbc3644e9450f9e087e

commit 004c737f7b097026c4231fbc3644e9450f9e087e
Merge: 1c06ba3 1feccb6
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Mon Aug 16 07:07:05 2010 -0700

    Merge branch 'master' of ssh://sourceware.org/git/glibc


http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1c06ba3100847da6bd1f2e011dc24fa8debd9615

commit 1c06ba3100847da6bd1f2e011dc24fa8debd9615
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Mon Aug 16 07:06:38 2010 -0700

    Simplify fanotify_init definition.

diff --git a/ChangeLog b/ChangeLog
index 5008892..d15354f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/syscalls.list: Add entry for fanotify_init
+	here.  Not...
+	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: ...here...
+	* sysdeps/unix/sysv/linux/i386/syscalls.list: ... orhere.
+
 2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* sysdeps/i386/elf/Makefile: New file.
diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index 893a4a8..149d432 100644
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -9,5 +9,4 @@ waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid
 
 prlimit64	EXTRA	prlimit64	i:iipp	prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiiis	fanotify_mark
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index a87906a..0f33454 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -101,3 +101,5 @@ mq_setattr	-	mq_getsetattr	i:ipp	__GI_mq_setattr	mq_setattr
 timerfd_create	EXTRA	timerfd_create	i:ii	timerfd_create
 timerfd_settime	EXTRA	timerfd_settime	i:iipp	timerfd_settime
 timerfd_gettime	EXTRA	timerfd_gettime	i:ip	timerfd_gettime
+
+fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
index 4471d53..fda3db1 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list
@@ -19,5 +19,4 @@ creat		-	creat		Ci:si	__libc_creat	creat creat64
 open		-	open		Ci:siv	__libc_open	__open open __open64 open64
 prlimit		EXTRA	prlimit64	i:iipp	prlimit		prlimit64
 
-fanotify_init	EXTRA	fanotify_init	i:ii	fanotify_init
 fanotify_mark	EXTRA	fanotify_mark	i:iiiis	fanotify_mark

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=93f17abfb514375ce7e2dff4e7c53842359fbc17

commit 93f17abfb514375ce7e2dff4e7c53842359fbc17
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Mon Aug 16 07:03:58 2010 -0700

    Fix last CL.

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 60dbf80..a0fe7b0 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,6 +1,6 @@
 2010-08-12  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* nptl/sysdeps/unix/sysv/linux/i386/Makefile: New file.
+	* sysdeps/unix/sysv/linux/i386/Makefile: New file.
 
 2010-05-01  Alan Modra  <amodra@gmail.com>
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                         |    7 +++++++
 nptl/ChangeLog                                    |    2 +-
 sysdeps/unix/sysv/linux/i386/syscalls.list        |    1 -
 sysdeps/unix/sysv/linux/syscalls.list             |    2 ++
 sysdeps/unix/sysv/linux/wordsize-64/syscalls.list |    1 -
 5 files changed, 10 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources