Re: [PATCH v4] libc: Extend __libc_freeres framework (Bug 23329).

[Carlos O'Donell <carlos at redhat dot com>]

On 06/28/2018 10:15 AM, Florian Weimer wrote:
> On 06/28/2018 04:13 PM, Carlos O'Donell wrote:
>> On 06/28/2018 09:44 AM, Florian Weimer wrote:
>>> On 06/28/2018 03:35 PM, Carlos O'Donell wrote:
>>>> This is the only commit I have on top of master.
>>>>
>>>> Where are the conflicts?
>>>
>>> git am cannot construct a common ancestor because it doesn't have a copy of the original file:
>>>
>>> diff --git a/ChangeLog b/ChangeLog
>>> index 1f35f29d77..5f34833c2c 100644
>>>
>>> Locally, I do not have a blob starting with 1f35f29d77, with master at commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80.
>>
>> I don't have it either, but git format-patch HEAD~2 still generates it.
>>
>> I also have master at 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80.
>>
>> I have two local commits on top of HEAD.
>>
>> commit ed8f443d30cb0e685a0be38f4587ca84a9e2e846 (HEAD)
>> commit d55ec04203058b78de125c8fd1f1762b649f228d
>> commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80 (origin/master, origin/HEAD)
> 
> Hmm, what do “git whatchanged” or “git ls-tree HEAD^ ChangeLog” show?

For the d55ec04203058b78de125c8fd1f1762b649f228d commit, which is the
__libc_freeres cleanup patch (the other patch is the malloc hook removal
sitting on top), we have:

:100644 100644 1f35f29d77... 5f34833c2c... M    ChangeLog
               ^^^^^^^^^^^^^

:100644 100644 56dcae0604... 34f9923334... M    dlfcn/Makefile
:100644 100644 97902f0dfd... 1df6925a92... M    dlfcn/Versions
:100644 100644 04dce9ddc6... 33574faab6... M    dlfcn/dlerror.c
:000000 100644 0000000000... 4004db0edb... A    dlfcn/dlfreeres.c
:000000 100644 0000000000... 7347672990... A    dlfcn/sdlfreeres.c
:100644 100644 c231309083... 0dc57dbe22... M    include/dlfcn.h
:100644 100644 6137304b0b... 8b9273c13a... M    include/libc-symbols.h
:100644 100644 0207656bb9... b3bd8b4092... M    include/set-hooks.h
:100644 100644 f4a0e7bda4... cda368479f... M    malloc/set-freeres.c
:100644 100644 8902c845bc... a63b6c93f3... M    malloc/thread-freeres.c
:100644 100644 0f9c44afa0... 2f2bb0569d... M    nptl/Makefile
:100644 100644 0ae5def464... b1c2da06c0... M    nptl/Versions
:100644 100644 9c10b993fd... f9e053f9e5... M    nptl/allocatestack.c
:100644 100644 f390480d4b... e254ea2552... M    nptl/libc_pthread_init.c
:100644 100644 1d3790f500... 907411d5bc... M    nptl/nptl-init.c
:000000 100644 0000000000... cfa54e1bc7... A    nptl/nptlfreeres.c
:100644 100644 075530c15c... 3cba0b6f9e... M    nptl/pthreadP.h
:100644 100644 38572b1d2f... 1c36dd5f1d... M    resolv/res-close.c
:100644 100644 b4021ab735... 2f0ffbc524... M    resolv/resolv_conf.c
:100644 100644 2a9c3b5e0b... 2a62b1f12c... M    string/strerror_l.c
:100644 100644 a65a90dc15... 0abe6dc172... M    sunrpc/rpc_thread.c
:100644 100644 b9842ccf40... 7111124439... M    sysdeps/mach/strerror_l.c
:100644 100644 53a4b38fbc... fa103695d9... M    sysdeps/nptl/pthread-functions.h
:100644 100644 0621c8002f... 5902fa4be7... M    sysdeps/nptl/unwind-forcedunwind.c
:100644 100644 c494d3fbf6... 6a7c7fd182... M    sysdeps/unix/sysv/linux/shm-directory.c

commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80 (origin/master, origin/HEAD)
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Thu Jun 28 13:27:31 2018 +0100

    Fix documentation build with old makeinfo
    
    With old makeinfo '@code {' fails because of the extra space.
    
            * manual/llio.texi: Remove spurious space.

:100644 100644 25e824faca... 1f35f29d77... M    ChangeLog
                             ^^^^^^^^^^
:100644 100644 e840c55f86... 2733b9cb73... M    manual/llio.texi

So it looks correct.

Cheers,
Carlos.