diff options
| author | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-02-05 15:29:39 -0600 |
|---|---|---|
| committer | Adhemerval Zanella <azanella@linux.vnet.ibm.com> | 2014-02-05 15:29:39 -0600 |
| commit | 8e6ea3948c217401a84cd1115ca0291bdf2be90c (patch) | |
| tree | eaddfae36bebda68ec64ee30bcbaf7cd005c2485 | |
| parent | fcb59062b1e2dcd9952dbf508c3fee7efcc329be (diff) | |
| download | glibc-8e6ea3948c217401a84cd1115ca0291bdf2be90c.tar glibc-8e6ea3948c217401a84cd1115ca0291bdf2be90c.tar.gz glibc-8e6ea3948c217401a84cd1115ca0291bdf2be90c.tar.bz2 glibc-8e6ea3948c217401a84cd1115ca0291bdf2be90c.zip | |
Fix wrong ChangeLog merge
| -rw-r--r-- | ChangeLog | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -386,7 +386,12 @@ 2013-10-25 Siddhesh Poyarekar <siddhesh@redhat.com> -<<<<<<< HEAD + [BZ #16072] + * sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on + heap for large requests. + +2013-10-10 Joseph Myers <joseph@codsourcery.com> + * sysdeps/ieee754/ldbl-128ibm/e_acosl.c (__ieee754_acosl): Check for NaNs before doing comparisons on argument. * sysdeps/ieee754/ldbl-128ibm/e_asinl.c (__ieee754_asinl): @@ -877,11 +882,6 @@ * sysdeps/unix/sysv/linux/tst-fanotify.c: New test. * sysdeps/unix/sysv/linux/Makefile (tests): Add tst-fanotify. -======= - [BZ #16072] - * sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on - heap for large requests. ->>>>>>> 6f95434... Fix stack overflow due to large AF_INET6 requests 2013-09-02 Joseph Myers <joseph@codesourcery.com> |