From: Aleksandar Ristovski <aristovski@qnx.com>
To: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: <gdb-patches@sourceware.org>
Subject: Re: [PATCH 5/8] Move linux_find_memory_regions_full & co.
Date: Tue, 16 Apr 2013 15:46:00 -0000 [thread overview]
Message-ID: <516D6AE0.3020200@qnx.com> (raw)
In-Reply-To: <20130414141619.GC23227@host2.jankratochvil.net>
On 13-04-14 10:16 AM, Jan Kratochvil wrote:
> On Tue, 09 Apr 2013 17:27:42 +0200, Aleksandar Ristovski wrote:
>>
>> Most notable change: read_alloc and read_stralloc are moved to new
>> common-target.[ch] files.
>
> This is not a move, it removes - and therefore regresses - this change:
>
> commit d8c11845465f076c6ae8078d2e8fb7c1d31f1181
> Fix compatibility with Linux kernel 3.8.3.
> commit 01a16f9b83c29db2c63106bbefeb505cbac17bd4
> Fix variable name shadowing.
>
> When you git merge gdb/master you got a conflict on linux-tdep.c. Therefore
> you have to apply the non-applicable trunk change of linux-tdep.c to the new
> file common/linux-maps.c instead. You apparently had to drop the linux-tdep.c
> conflict without updating common/linux-maps.c.
Sorry about that. Wrong merge. I'm not sure if I messed it up or
automerge did it, but it's fixed now.
---
Aleksandar
next prev parent reply other threads:[~2013-04-16 15:44 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 16:15 [PATCH 0/8] v2 - validate binary before use Aleksandar Ristovski
2013-04-09 15:53 ` [PATCH 1/8] Move utility functions to common/ Aleksandar Ristovski
2013-04-09 16:01 ` [PATCH 2/8] Merge multiple hex conversions Aleksandar Ristovski
2013-04-09 16:03 ` [PATCH 3/8] Create empty common/linux-maps.[ch] and common/common-target.[ch] Aleksandar Ristovski
2013-04-15 13:34 ` Jan Kratochvil
2013-04-09 16:39 ` [PATCH 4/8] Prepare linux_find_memory_regions_full & co. for move Aleksandar Ristovski
2013-04-15 13:36 ` Jan Kratochvil
2013-04-16 17:19 ` Aleksandar Ristovski
2013-04-09 16:48 ` [PATCH 5/8] Move linux_find_memory_regions_full & co Aleksandar Ristovski
2013-04-15 13:52 ` Jan Kratochvil
2013-04-16 15:46 ` Aleksandar Ristovski [this message]
2013-04-09 16:55 ` [PATCH 6/8] gdbserver build-id attribute generator Aleksandar Ristovski
2013-04-09 18:52 ` Eli Zaretskii
2013-04-15 14:23 ` Jan Kratochvil
2013-04-16 16:40 ` Aleksandar Ristovski
2013-04-18 10:08 ` Jan Kratochvil
2013-04-09 17:37 ` [PATCH 8/8] Tests for validate symbol file using build-id Aleksandar Ristovski
2013-04-15 15:12 ` Jan Kratochvil
2013-04-16 17:25 ` Aleksandar Ristovski
2013-04-18 5:37 ` Jan Kratochvil
2013-04-09 17:50 ` [PATCH 7/8] Validate " Aleksandar Ristovski
2013-04-10 22:35 ` Aleksandar Ristovski
2013-04-10 19:58 ` Aleksandar Ristovski
2013-04-11 1:26 ` Jan Kratochvil
2013-04-11 2:43 ` Aleksandar Ristovski
2013-04-15 14:58 ` Jan Kratochvil
2013-04-16 19:14 ` Aleksandar Ristovski
2013-04-18 10:23 ` Jan Kratochvil
2013-04-09 17:53 ` [PATCH 0/8] v2 - validate binary before use Jan Kratochvil
2013-04-09 18:09 ` Aleksandar Ristovski
2013-04-16 18:03 ` Aleksandar Ristovski
2013-04-16 18:30 ` [PATCH 2/8] Merge multiple hex conversions Aleksandar Ristovski
2013-04-16 18:30 ` [PATCH 7/8] Validate symbol file using build-id Aleksandar Ristovski
2013-04-16 18:31 ` [PATCH 4/8] Prepare linux_find_memory_regions_full & co. for move Aleksandar Ristovski
2013-04-18 8:58 ` Jan Kratochvil
2013-04-16 18:31 ` [PATCH 1/8] Move utility functions to common/ Aleksandar Ristovski
2013-04-16 18:31 ` [PATCH 6/8] gdbserver build-id attribute generator Aleksandar Ristovski
2013-04-18 7:40 ` Jan Kratochvil
2013-04-16 18:31 ` [PATCH 5/8] Move linux_find_memory_regions_full & co Aleksandar Ristovski
2013-04-16 18:31 ` [PATCH 8/8] Tests for validate symbol file using build-id Aleksandar Ristovski
2013-04-18 10:15 ` Jan Kratochvil
2013-04-16 20:24 ` [PATCH 3/8] Create empty common/linux-maps.[ch] and common/common-target.[ch] Aleksandar Ristovski
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=516D6AE0.3020200@qnx.com \
--to=aristovski@qnx.com \
--cc=gdb-patches@sourceware.org \
--cc=jan.kratochvil@redhat.com \
/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