This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [PATCH 5/8] Move linux_find_memory_regions_full & co.

From: Aleksandar Ristovski <aristovski at qnx dot com>
To: Jan Kratochvil <jan dot kratochvil at redhat dot com>
Cc: <gdb-patches at sourceware dot org>
Date: Tue, 16 Apr 2013 11:14:40 -0400
Subject: Re: [PATCH 5/8] Move linux_find_memory_regions_full & co.
References: <1365521265-28870-1-git-send-email-ARistovski at qnx dot com> <1365521265-28870-6-git-send-email-ARistovski at qnx dot com> <20130414141619 dot GC23227 at host2 dot jankratochvil dot 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 orautomerge did it, but it's fixed now.


---
Aleksandar

References:
- [PATCH 0/8] v2 - validate binary before use
  - From: Aleksandar Ristovski
- [PATCH 5/8] Move linux_find_memory_regions_full & co.
  - From: Aleksandar Ristovski
- Re: [PATCH 5/8] Move linux_find_memory_regions_full & co.
  - From: Jan Kratochvil

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]