From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-94607-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 27945 invoked by alias); 17 Sep 2012 20:54:02 -0000
Received: (qmail 27936 invoked by uid 22791); 17 Sep 2012 20:54:01 -0000
X-SWARE-Spam-Status: No, hits=-6.8 required=5.0	tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28)    by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 17 Sep 2012 20:53:49 +0000
Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8HKrmPG002933	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);	Mon, 17 Sep 2012 16:53:48 -0400
Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q8HKrlCl032071	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO);	Mon, 17 Sep 2012 16:53:48 -0400
From: Tom Tromey <tromey@redhat.com>
To: Mike Wrighton <mike_wrighton@mentor.com>
Cc: <gdb-patches@sourceware.org>
Subject: Re: [commit] Hardware breakpoint errors patch, gdb/MAINTAINERS
References: <50578114.3080307@mentor.com>
Date: Mon, 17 Sep 2012 20:54:00 -0000
In-Reply-To: <50578114.3080307@mentor.com> (Mike Wrighton's message of "Mon,	17 Sep 2012 14:59:16 -0500")
Message-ID: <87obl4xtes.fsf@fleche.redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2012-09/txt/msg00330.txt.bz2

>>>>> "Mike" == Mike Wrighton <mike_wrighton@mentor.com> writes:

Mike> I've committed the following patches to fix the hardware breakpoint
Mike> errors bug and add myself to the gdb/MAINTAINERS list (I had to
Mike> correct an error in the gdb/Changelog entry hence 2 patches for that
Mike> file).

Mike> diff -u -r1.14670 -r1.14671
Mike> --- src/gdb/ChangeLog	2012/09/17 18:27:57	1.14670
Mike> +++ src/gdb/ChangeLog	2012/09/17 19:16:48	1.14671
[...]
Mike>  +>>>>>>> 1.14670

Forgotten conflict marker.

Tom