Re: Please pull ACPI updates

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andi Kleen <andi@...>
Cc: Ray Lee <ray-lk@...>, Jesse Barnes <jbarnes@...>, Rafael J. Wysocki <rjw@...>, <torvalds@...>, <linux-kernel@...>, <linux-acpi@...>
Date: Thursday, July 17, 2008 - 4:28 pm

On Thu, 17 Jul 2008, 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.

So using rebase to clean up and simplify and/or fix up stupid ordering 
issues is good, and "git rebase -i" is actually really good for this 
thing.

No, the problems start happening when you do it on a larger scale, or (and 
this is very common in the kernel), your rebase _moves_ the commits over 
big distances because you update to the top of my development tree. In 
that case, while your patches themselves may not have changed, the base 
that you based them on may have changed really subtly - it still compiles, 
it still "works", but maybe it doesn't work as well as it used to. And 
that's why the old testing you did is basically almost worthless.

So rebasing can be good or bad. It's a matter of degree. Rebasing private 
and small things is generally good. Rebasing bigger things can cause 
problems. And the further away you rebase something, the more problems it 
will generally cause. 

		Linus
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Please pull ACPI updates, Andi Kleen, (Wed Jul 16, 5:45 pm)
Re: Please pull ACPI updates, Rafael J. Wysocki, (Wed Jul 16, 6:11 pm)
Re: Please pull ACPI updates, Jesse Barnes, (Wed Jul 16, 7:33 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 2:47 am)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 11:18 am)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 11:47 am)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 12:23 pm)
Re: Please pull ACPI updates, Ray Lee, (Thu Jul 17, 3:11 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 3:49 pm)
Re: Please pull ACPI updates, Ray Lee, (Thu Jul 17, 4:11 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 4:29 pm)
Re: Please pull ACPI updates, , (Fri Jul 18, 2:39 am)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 4:01 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 4:16 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 4:34 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 4:28 pm)
Re: Please pull ACPI updates, Olivier Galibert, (Fri Jul 18, 9:25 am)
Re: Please pull ACPI updates, Ray Lee, (Fri Jul 18, 11:57 am)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 4:14 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 12:02 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Wed Jul 16, 7:45 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 2:40 am)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 11:03 am)
Re: Please pull ACPI updates, Len Brown, (Thu Jul 17, 2:49 pm)
Re: Please pull ACPI updates, J. Bruce Fields, (Thu Jul 17, 5:15 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 3:12 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 3:16 pm)
Re: Please pull ACPI updates, Harvey Harrison, (Thu Jul 17, 3:12 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 3:50 pm)
Re: Please pull ACPI updates, Jesse Barnes, (Wed Jul 16, 7:51 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Wed Jul 16, 8:32 pm)
Re: Please pull ACPI updates, Andi Kleen, (Thu Jul 17, 2:45 am)
Re: Please pull ACPI updates, Linus Torvalds, (Thu Jul 17, 11:06 am)
Re: Please pull ACPI updates, Linus Torvalds, (Wed Jul 16, 8:53 pm)
Re: Please pull ACPI updates, Jesse Barnes, (Wed Jul 16, 10:26 pm)
Re: Please pull ACPI updates, Linus Torvalds, (Wed Jul 16, 10:56 pm)