[glibc] 02/02: Merge branch 'glibc-2.23' of ssh://git.debian.org/git/pkg-glibc/glibc into glibc-2.23

[Samuel Thibault <sthibault@moszumanska.debian.org>]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch glibc-2.23
in repository glibc.

commit e05091ed805f1b56fac5d1282e9a114e16fbffb3
Merge: e9b5470 023a8c8
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Thu Mar 17 08:36:13 2016 +0000

    Merge branch 'glibc-2.23' of ssh://git.debian.org/git/pkg-glibc/glibc into glibc-2.23

 debian/changelog                                  |  2 +
 debian/patches/hurd-i386/cvs-libpthread-2.23.diff | 66 +++++++++++++++++++++++
 debian/patches/hurd-i386/cvs-libpthread.diff      | 20 +++----
 debian/patches/series                             |  1 +
 4 files changed, 79 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 631e086,9bd070f..4f1b135
--- a/debian/changelog
+++ b/debian/changelog
@@@ -11,8 -11,8 +11,10 @@@ glibc (2.23-0experimental1) UNRELEASED
    * hurd-i386/cvs-openat.diff: Fix __openat prototype.
    * hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
    * hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
+   * hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
+   * hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
 +  * hurd-i386/unsubmitted-libpthread.so.diff: Fix building malloc tests.
 +  * hurd-i386/local-test-skip.diff: Skip test which just overflows memory.
  
   -- Aurelien Jarno <aurel32@debian.org>  Mon, 14 Mar 2016 00:14:11 +0100
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git