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

Aleksandar Ristovski
2013-04-16T15:44:02Z

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