All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Rene Herman <rene.herman@keyaccess.nl>
Cc: ALSA devel <alsa-devel@alsa-project.org>,
	Takashi Iwai <tiwai@suse.de>,
	Linux Kernel <linux-kernel@vger.kernel.org>,
	Glauber Costa <gcosta@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Pete Clements <clem@clem.clem-digital.net>
Subject: Re: 2.6.26-rc1 regression: ISA DMA broken (bisected)
Date: Tue, 13 May 2008 16:36:19 +0200	[thread overview]
Message-ID: <20080513143619.GA1714@elte.hu> (raw)
In-Reply-To: <4824D79C.7060303@keyaccess.nl>


* Rene Herman <rene.herman@keyaccess.nl> wrote:

>> great, thanks Rene for catching this! Added this line to the patch as 
>> well:
>>
>>  Tested-by: Rene Herman <rene.herman@keyaccess.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

WARNING: multiple messages have this Message-ID (diff)
From: Ingo Molnar <mingo@elte.hu>
To: Rene Herman <rene.herman@keyaccess.nl>
Cc: Takashi Iwai <tiwai@suse.de>, Glauber Costa <gcosta@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Pete Clements <clem@clem.clem-digital.net>,
	Linux Kernel <linux-kernel@vger.kernel.org>,
	ALSA devel <alsa-devel@alsa-project.org>
Subject: Re: 2.6.26-rc1 regression: ISA DMA broken (bisected)
Date: Tue, 13 May 2008 16:36:19 +0200	[thread overview]
Message-ID: <20080513143619.GA1714@elte.hu> (raw)
In-Reply-To: <4824D79C.7060303@keyaccess.nl>


* Rene Herman <rene.herman@keyaccess.nl> wrote:

>> great, thanks Rene for catching this! Added this line to the patch as 
>> well:
>>
>>  Tested-by: Rene Herman <rene.herman@keyaccess.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

  reply	other threads:[~2008-05-13 14:36 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-09  1:37 2.6.26-rc1 regression: ISA DMA broken (bisected) Rene Herman
2008-05-09  1:37 ` Rene Herman
2008-05-09  6:06 ` Takashi Iwai
2008-05-09  6:06   ` Takashi Iwai
2008-05-09  8:55   ` Ingo Molnar
2008-05-09  8:55     ` Ingo Molnar
2008-05-09  8:58     ` Ingo Molnar
2008-05-09 17:20       ` Jesse Barnes
2008-05-09 12:03   ` Rene Herman
2008-05-09 12:03     ` Rene Herman
2008-05-09 12:28     ` Ingo Molnar
2008-05-09 12:28       ` Ingo Molnar
2008-05-09 23:00       ` Rene Herman
2008-05-09 23:00         ` Rene Herman
2008-05-13 14:36         ` Ingo Molnar [this message]
2008-05-13 14:36           ` Ingo Molnar
2008-05-13 15:26           ` Rene Herman
2008-05-09 12:29     ` Pete Clements
2008-05-09 12:29       ` Pete Clements
2008-05-09 12:48   ` Glauber Costa
2008-05-13 16:59   ` Bjorn Helgaas
2008-05-13 16:59     ` Bjorn Helgaas
2008-05-13 17:01     ` Alan Cox
2008-05-13 17:01       ` Alan Cox
2008-05-13 17:33       ` Rene Herman
2008-05-13 17:33         ` Rene Herman
2008-05-13 23:18         ` Bjorn Helgaas
2008-05-13 23:18           ` Bjorn Helgaas
2008-05-14  9:25           ` Takashi Iwai
2008-05-14  9:25             ` Takashi Iwai
2008-05-14 12:46           ` Rene Herman
2008-05-14 12:46             ` Rene Herman
2008-05-14 13:01             ` Takashi Iwai
2008-05-14 15:40               ` Rene Herman
2008-05-14 15:40                 ` Rene Herman
2008-05-14 15:53                 ` Takashi Iwai
2008-05-14 15:53                   ` Takashi Iwai
2008-05-14 18:41                 ` Rene Herman
2008-05-14 18:50                   ` Bjorn Helgaas
2008-05-14 19:09                     ` Rene Herman
2008-05-14 19:09                       ` Rene Herman
2008-05-30 21:15                       ` [PATCH] " Rene Herman
2008-05-30 21:15                         ` Rene Herman
2008-05-30 21:28                         ` [DEVICE MODEL] dev->dma_mask Rene Herman
2008-05-30 21:28                           ` Rene Herman
2008-05-30 21:43                         ` [PATCH] Re: 2.6.26-rc1 regression: ISA DMA broken (bisected) Bjorn Helgaas
2008-05-30 21:43                           ` Bjorn Helgaas
2008-05-30 22:11                           ` Rene Herman
2008-05-30 22:11                             ` Rene Herman
2008-05-30 22:37                             ` [PATCH] ISA: set 24-bit dma_mask for ISA devices Rene Herman
2008-05-30 22:37                               ` Rene Herman
2008-05-30 22:55                               ` Andrew Morton
2008-05-30 22:55                                 ` Andrew Morton
2008-05-30 23:50                                 ` Rene Herman
2008-05-30 23:50                                   ` Rene Herman
2008-05-30 23:54                             ` [PATCH] PNP: set the pnp_card dma_mask for use by ISAPnP cards Rene Herman
2008-05-30 23:54                               ` Rene Herman
2008-05-31  8:55                               ` Takashi Iwai
2008-05-31  8:55                                 ` Takashi Iwai
2008-05-30 23:55                             ` [PATCH] ISA: set 24-bit dma_mask for ISA devices Rene Herman
2008-05-30 23:55                               ` Rene Herman
2008-05-31  8:56                               ` Takashi Iwai
2008-05-31  8:56                                 ` Takashi Iwai
2008-05-14 15:26             ` 2.6.26-rc1 regression: ISA DMA broken (bisected) Bjorn Helgaas
2008-05-14 15:26               ` Bjorn Helgaas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080513143619.GA1714@elte.hu \
    --to=mingo@elte.hu \
    --cc=alsa-devel@alsa-project.org \
    --cc=clem@clem.clem-digital.net \
    --cc=gcosta@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rene.herman@keyaccess.nl \
    --cc=tglx@linutronix.de \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.