public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Florian Weimer <fweimer@redhat.com>
To: Carlos O'Donell <carlos@redhat.com>,
	GNU C Library <libc-alpha@sourceware.org>,
	DJ Delorie <dj@redhat.com>
Subject: Re: [PATCH v4] libc: Extend __libc_freeres framework (Bug 23329).
Date: Thu, 28 Jun 2018 13:44:00 -0000	[thread overview]
Message-ID: <4b89f9db-2d0a-fc61-4f7c-f8903f9c4d14@redhat.com> (raw)
In-Reply-To: <be30b49c-a791-796e-db62-841ed0697184@redhat.com>

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.

Thanks,
Florian

  reply	other threads:[~2018-06-28 13:44 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-27  3:06 [PATCH] " Carlos O'Donell
2018-06-27  9:46 ` Florian Weimer
2018-06-28  4:15   ` [PATCH v2] " Carlos O'Donell
2018-06-28 12:13     ` Florian Weimer
2018-06-28 13:07       ` [PATCH v3] " Carlos O'Donell
2018-06-28 13:22         ` Florian Weimer
2018-06-28 13:36           ` [PATCH v4] " Carlos O'Donell
2018-06-28 13:44             ` Florian Weimer [this message]
2018-06-28 14:13               ` Carlos O'Donell
2018-06-28 14:15                 ` Florian Weimer
2018-06-28 14:26                   ` Carlos O'Donell
2018-06-28 14:50                     ` Florian Weimer
2018-06-28 19:03                 ` Andreas Schwab
2018-06-28 19:10                   ` Florian Weimer
2018-07-02  8:56                     ` Andreas Schwab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4b89f9db-2d0a-fc61-4f7c-f8903f9c4d14@redhat.com \
    --to=fweimer@redhat.com \
    --cc=carlos@redhat.com \
    --cc=dj@redhat.com \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).