[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080513143619.GA1714@elte.hu>
Date: Tue, 13 May 2008 16:36:19 +0200
From: Ingo Molnar <mingo@...e.hu>
To: Rene Herman <rene.herman@...access.nl>
Cc: Takashi Iwai <tiwai@...e.de>, Glauber Costa <gcosta@...hat.com>,
Thomas Gleixner <tglx@...utronix.de>,
Pete Clements <clem@...m.clem-digital.net>,
Linux Kernel <linux-kernel@...r.kernel.org>,
ALSA devel <alsa-devel@...a-project.org>
Subject: Re: 2.6.26-rc1 regression: ISA DMA broken (bisected)
* Rene Herman <rene.herman@...access.nl> wrote:
>> great, thanks Rene for catching this! Added this line to the patch as
>> well:
>>
>> Tested-by: Rene Herman <rene.herman@...access.nl>
>
> Oh... it was rather significantly in the AM when I posted so I forgot
> to mention in the haste to get this out of the way but it was Pete
> Clements who reported the regression:
>
> http://www.nabble.com/Lost-Sound-from-2.6.24-to-2.6.25----CS4236-ISA-tc17062547.html
>
> He also tested it, so as long as we're name-mention-flattering
> around...
>
> And this a good excuse to ask how you edit changelog after the fact.
> Just reset/reapply and stuff or is there a "better" way? I fairly
> frequently find myself wanting to do just that but it's a bit of a
> mess when there's already commits on top.
generally we prefer append-only repositories for public trees.
But as long as you've not pushed it out to others yet, i.e. it's a
purely local development tree, you can use two methods:
If it's just one commit in some devel branch that you want to put into a
'fixes' branch one you can use git-cherry-pick --edit to shuffle it
over.
For more complex scenarios you can use git-rebase --interactive to
rebase your commits and to edit them. Replace the command "pick" with
"edit" to change/fix the commit message. "squash" can be used to fold
fixes.
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists