From 8e6ea3948c217401a84cd1115ca0291bdf2be90c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 5 Feb 2014 15:29:39 -0600 Subject: [PATCH] Fix wrong ChangeLog merge --- ChangeLog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a0f1959452..01518f87074 100644 --- a/ChangeLog +++ b/ChangeLog @@ -386,7 +386,12 @@ 2013-10-25 Siddhesh Poyarekar -<<<<<<< HEAD + [BZ #16072] + * sysdeps/posix/getaddrinfo.c (gethosts): Allocate tmpbuf on + heap for large requests. + +2013-10-10 Joseph Myers + * 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 -- 2.47.2