From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=42227 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PsLHp-0000v9-LQ
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 15:26:14 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lists@wiesinger.com>) id 1PsLHo-0007y8-CM
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 15:26:13 -0500
Received: from chello084112167138.7.11.vie.surfer.at ([84.112.167.138]:34382
	helo=wiesinger.com) by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lists@wiesinger.com>) id 1PsLHn-0007xv-Ul
	for qemu-devel@nongnu.org; Wed, 23 Feb 2011 15:26:12 -0500
Date: Wed, 23 Feb 2011 21:24:57 +0100 (CET)
From: Gerhard Wiesinger <lists@wiesinger.com>
Subject: Re: [Qemu-devel] [PATCH 2/2 V1] Fixed EPROM for AMD driver
	compatibility under DOS with Netware driver
In-Reply-To: <AANLkTikW0rX6JUrZFL8Wv2y81bKWzW+yxKeOsqa3cM+K@mail.gmail.com>
Message-ID: <alpine.LFD.2.02.1102232120500.25721@bbs.intern>
References: <alpine.LFD.2.02.1102202038360.26526@bbs.intern>
	<alpine.LFD.2.02.1102222159010.2912@bbs.intern>
	<AANLkTik4ujGrwSanLL1LJJU7q=PLwXSp1xdkEWGAVX9g@mail.gmail.com>
	<alpine.LFD.2.02.1102231904480.28972@bbs.intern>
	<AANLkTikW0rX6JUrZFL8Wv2y81bKWzW+yxKeOsqa3cM+K@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-devel@nongnu.org

On Wed, 23 Feb 2011, Peter Maydell wrote:

> On 23 February 2011 18:06, Gerhard Wiesinger <lists@wiesinger.com> wrote:
>> I'm not a git expert. Can you explain how to merge 3 commit to one output as
>> expected?
>
> There are a number of ways to do it. I use stgit (http://www.procode.org/stgit/)
> to manage my patches, but if you don't want to use a new tool I guess
> the top answer here:
> http://stackoverflow.com/questions/616556/how-do-you-squash-commits-into-one-patch-with-git-format-patch
> is probably as good as anything else.

Thanx for your help, resent the patch.

For newbies for documentation how to submit a qemu patch made of several 
commits:
# Last commit before patch
git branch pcnet-amd-fix 1899e4afdc2d838be5625539df9c87cca49bdd70
git checkout pcnet-amd-fix
git merge --squash master
git commit -a -F - <<EOF
hw/pcnet.c: Fix EPROM contents to suit AMD netware drivers

bugfix under DOS for AMD netware driver:
AMD PCNTNW Ethernet MLID v3.10 (960115), network card not found

bugfix works well under DOS with:
1.) AMD NDIS driver v2.0.1
2.) AMD PCNTNW Ethernet MLID v3.10 (960115)
3.) Knoppix 6.2
EOF
git format-patch master
git checkout master

Ciao,
Gerhard

--
http://www.wiesinger.com/