From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSscA-0005df-IY for qemu-devel@nongnu.org; Thu, 07 Jan 2010 08:41:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSsc6-0005bm-0H for qemu-devel@nongnu.org; Thu, 07 Jan 2010 08:41:26 -0500 Received: from [199.232.76.173] (port=50894 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSsc5-0005ba-Rp for qemu-devel@nongnu.org; Thu, 07 Jan 2010 08:41:21 -0500 Received: from mail-gx0-f223.google.com ([209.85.217.223]:59104) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSsc5-0004Zy-EX for qemu-devel@nongnu.org; Thu, 07 Jan 2010 08:41:21 -0500 Received: by gxk23 with SMTP id 23so21651487gxk.2 for ; Thu, 07 Jan 2010 05:41:19 -0800 (PST) Message-ID: <4B45E47E.2060708@codemonkey.ws> Date: Thu, 07 Jan 2010 07:41:18 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 06/17] eepro100: symbolic names for pci registers References: <20091210181046.GG25707@redhat.com> <4B45C209.1030802@mail.berlios.de> <20100107125121.GG599@redhat.com> In-Reply-To: <20100107125121.GG599@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Paul Brook , qemu-devel@nongnu.org On 01/07/2010 06:51 AM, Michael S. Tsirkin wrote: > A simple solution that worked for me is to publish a git tree and send > pull requests (in addition to individual patches). This guarantees that > nothing is lost and makes it easy for Anthony to apply a set of changes > in one go. git merge also has smarter heuristics than git am. > > I put the patch you just posted on my tree as it's PCI related and I > understand it, but if you create your own tree and want me to drop this > patch from my tree, pls let me know and I will. > I would actually be happy to pull eepro100 changes through Michael's tree. Michael has been very good about reviewing patches quickly and so far, it's been working pretty well. Regards, Anthony Liguori