public inbox for frysk@sourceware.org
 help / color / mirror / Atom feed
From: Mark Wielaard <mark@klomp.org>
To: frysk@sourceware.org
Cc: moore@sourceware.org
Subject: Re: [SCM]  master: Merge branch 'master' into topic/elfutils
Date: Tue, 18 Mar 2008 11:21:00 -0000	[thread overview]
Message-ID: <1205839262.3390.30.camel@dijkstra.wildebeest.org> (raw)
In-Reply-To: <20080317160343.18782.qmail@sourceware.org>

Hi Tim,

On Mon, 2008-03-17 at 16:03 +0000, moore@sourceware.org wrote:
> commit 581f34133cec7c18be6fbfc298817021ba1ddd9c
> Author: Tim Moore <moore@blackbox.bricoworks.com>
> Date:   Thu Mar 13 18:24:17 2008 +0100
> 
>     Bug fixes to elfutils
>     
>     frysk-imports/elfutils/libelf/ChangeLog:
>     2008-03-13  Tim Moore  <timoore@redhat.com>
>     
>     	* elf_getdata_rawchunk.c (elf_getdata_rawchunk): Cast offset and
>     	size computation to uint64_t.
>     
>     frysk-imports/elfutils/libdwfl/ChangeLog:
>     2008-03-13  Tim Moore  <timoore@redhat.com>
>     
>     	* dwfl_module_addrsym.c (dwfl_module_addrsym): Start min_label
>     	from 0 to allow sizeless symbols below the address. Choose the
>     	best sizeless symbol.

Did you push these two upstream?

I also noticed:

> diff --git a/frysk-imports/elfutils/ChangeLog b/frysk-imports/elfutils/ChangeLog
> index c4e46d3..fee15a4 100644
> --- a/frysk-imports/elfutils/ChangeLog
> +++ b/frysk-imports/elfutils/ChangeLog
> @@ -1,13 +1,14 @@
> +2007-12-20  Ulrich Drepper  <drepper@redhat.com>
> +
> +       * configure.ac: Add support for --enable-debugpred.
> +       Update likely/unlikely macros for it.
> +
>  2007-06-05  Ulrich Drepper  <drepper@redhat.com>
>  
>         * Makefile.am: Remove traces of mini builds.
>         * configure.ac: Don't use libelf-po/POTFILES.in as config file
>         anymore.
>  
> -2007-05-28  Nurdin Premji  <npremji@redhat.com>
> - 
> -       * libdwfl/libdwfl.h: Publicize elf_from_remote_memory.
> -
>  2007-05-16  Roland McGrath  <roland@redhat.com>
>  
>         * configure.ac (AM_INIT_AUTOMAKE): Use -Wno-portability.
> @@ -20,11 +21,6 @@
>  
>         * configure.ac: Use AM_MAINTAINER_MODE.
>  
> -2006-08-19  Stepan Kasal  <skasal@redhat.com>
> - 
> -       * Makefile.am: Do not run installcheck nor uninstall either.
> -       Do not define all targets on one line, attach explanation.
> - 
>  2006-07-12  Ulrich Drepper  <drepper@redhat.com>
>  
>         * configure.ac (internal_function): Don't use internal visibility.
> @@ -34,10 +30,6 @@
>         * configure.ac: Add dummy automake conditional to get dependencies
>         for non-generic linker right.  See src/Makefile.am.
>  
> -2006-06-27  Rick Moseley  <rmoseley@redhat.com>
> -       
> -       * Makefile.am: Change to not install for frysk.
> -       
>  2005-11-18  Roland McGrath  <roland@redhat.com>
>  
>         * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.

So, our own ChangeLog entries disappear on a merge.
It might make sense to add a ChangeLog.frysk file to add our ChangeLog
entries to so they stay around when we do a new merge.

Cheers,

Mark

           reply	other threads:[~2008-03-18 11:21 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <20080317160343.18782.qmail@sourceware.org>]

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=1205839262.3390.30.camel@dijkstra.wildebeest.org \
    --to=mark@klomp.org \
    --cc=frysk@sourceware.org \
    --cc=moore@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).