From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2180 invoked by alias); 16 Apr 2013 15:44:02 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 2170 invoked by uid 89); 16 Apr 2013 15:44:01 -0000 X-Spam-SWARE-Status: No, score=-4.6 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from na3sys009aog129.obsmtp.com (HELO na3sys009aog129.obsmtp.com) (74.125.149.142) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 16 Apr 2013 15:44:00 +0000 Received: from mx20.qnx.com ([72.1.200.103]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUW1xvjJ1Qid8XHfnVDZf5kZoikHEg5Op@postini.com; Tue, 16 Apr 2013 08:44:00 PDT Received: by mx20.qnx.com (Postfix, from userid 500) id 1546621128; Tue, 16 Apr 2013 11:43:58 -0400 (EDT) Received: from exhts.ott.qnx.com (exch2 [10.222.2.136]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mx20.qnx.com (Postfix) with ESMTPS id C04A421126; Tue, 16 Apr 2013 11:43:57 -0400 (EDT) Received: from [10.222.96.215] (10.222.2.5) by EXCH2.ott.qnx.com (10.222.2.136) with Microsoft SMTP Server (TLS) id 14.2.318.4; Tue, 16 Apr 2013 11:43:57 -0400 Message-ID: <516D6AE0.3020200@qnx.com> Date: Tue, 16 Apr 2013 15:46:00 -0000 From: Aleksandar Ristovski User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130329 Thunderbird/17.0.5 MIME-Version: 1.0 To: Jan Kratochvil CC: Subject: Re: [PATCH 5/8] Move linux_find_memory_regions_full & co. References: <1365521265-28870-1-git-send-email-ARistovski@qnx.com> <1365521265-28870-6-git-send-email-ARistovski@qnx.com> <20130414141619.GC23227@host2.jankratochvil.net> In-Reply-To: <20130414141619.GC23227@host2.jankratochvil.net> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2013-04/txt/msg00481.txt.bz2 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