Re: [PATCH] x86: kill arch/x86/kernel/mpparse.c debugging printk.

Rene Herman
2008-08-11T18:54:56Z

On 11-08-08 20:33, Ingo Molnar wrote:

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

>> Thanks and fine ofcourse but from the Cheats 'R Us GIT handbook, when
>> there's n patches on top of the one I want to edit:
>>
>> $ mkdir tmp
>> $ git format-patch -o tmp HEAD~n
>> $ git reset --hard HEAD~n
>> $ git reset --soft HEAD^
>> <fix>
>> $ git commit -a -c ORIG_HEAD
>> $ git am tmp/*
>> $ rm -rf tmp
>>
>> Just in case someone finds it interesting... :-)
>
> i think something like this would do it as well:
>
> git-rebase -i HEAD~$[n+1]
>
> Change the patch you want to edit from 'pick' to 'edit', and do a "git
> commit --amend" to fix it up and then a "git rebase continue" to reapply
> the other n patches ontop of the changed patch. (This is straight from
> the Cheats 'R Us GIT handbook, second edition ;-)

Okay, okay, okay, so nobody found it interesting. Got the same bit of
advice in private approximately 2 seconds after sending... ;-)

Thanks to both though. And now that you mention it, I remember actually
having gotten the rebase -i advice earlier but it had slipped my mind
again. Just tried it and it works nicely.

> The problem with rebasing though is that it does not interact with
> normal Git workflows very nicely. Someone might have based further work
> on those sha1's that we now change under them. When that further work is
> backmerged later on we have overlapping sha1's.

Yes, I'm endpoint.

> There are two further specific non-Git-workflow arguments in favor of
> the delta patch as well:
>
> - in this case your first change was the obvious one and your NULL fix
> and your cleanup to the parameter expose a fundamental weakness of
> early_param conversions - and i think highlighting that as separate
> commits might give someone ideas to improve the early_param()
> facility, if they see the fix patterns.

On that note, I sort of wonder why there is an early_param(). As in, not
just a kernel_param(). Does __setup() have fundamental advantages over
early_param()?

> - Also, the NULL condition is obscure, so there's no bisection breakage
> risk and it's the easiest for me to do append-only patches. The effort
> and thought process you and Cyrill have put into it deserve a separate
> commit as well anyway - and others might learn from it when looking at
> logs.

(true, I neglected to point out Cyrill's bug catching)

Rene