Messages in this thread | | | Date | Fri, 18 Jul 2008 15:25:21 +0200 | From | Olivier Galibert <> | Subject | Re: Please pull ACPI updates |
| |
On Thu, Jul 17, 2008 at 01:28:20PM -0700, Linus Torvalds wrote: > One final note on this: the above is obviously not a problem for simple > code that only really does one thing, and in particular for code that you > wrote yourself. Moving your own commits around to make them make more > sense - or splitting them up etc - is often a _good_ thing, even if it > obviously does change history.
You seem to be talking of subtly different things Andi and you, and since I'm quite interested in the answer I'll try to rephrase what I understood.
You say "don't rebase on the most recent kernel version". Andi seems to accept that going forwards. You say "use topic branches that are based on whatever kernel version you had at the time, I'll do the merge". That's ok too. His remaining question is "what do I do with broken patches _in_the_topic_branch_?". He wants to amend/merge/split/reorder within the topic branch so that the branch itself is bisectable. So what should be done there?
OG.
| |