[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20080811184257.GB18969@lenovo>
Date: Mon, 11 Aug 2008 22:42:57 +0400
From: Cyrill Gorcunov <gorcunov@...il.com>
To: Ingo Molnar <mingo@...e.hu>
Cc: Rene Herman <rene.herman@...access.nl>,
Andrew Morton <akpm@...l.org>,
Yinghai Lu <yhlu.kernel@...il.com>,
Linux Kernel <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] x86: kill arch/x86/kernel/mpparse.c debugging printk.
[Ingo Molnar - Mon, Aug 11, 2008 at 08:33:00PM +0200]
|
| * Rene Herman <rene.herman@...access.nl> wrote:
|
| > On 11-08-08 19:41, Ingo Molnar wrote:
| >
| >> * Rene Herman <rene.herman@...access.nl> wrote:
| >
| >>> Ah, I was unaware of that difference, thank you. Ingo, can you
| >>> replace the previous incarnation with this one?
| >>
| >> sure - but some other commits were queued already so i've applied the
| >> delta fix below.
| >
| > 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 ;-)
|
| 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.
|
| 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.
Ingo - I think the problem with early_param is not NULL itself but
rather - what is the right way to deal with boot params? I mean we
could pass empty string (not NULL) in case of argument absence _but_ would it
be the right way? If you remember when I sent first series for early_param
checking (and actually there are number of same issue exists for example
in s390 arch) - I was asking community what is the best way - since I'm not
that strong in interface engineering - i prefer fix the bugs :)
|
| - 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.
|
| Ingo
|
- Cyrill -
--
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