lkml.org 
[lkml]   [2008]   [May]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [GIT pull] x86 fixes for 2.6.26
From
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 May 2008 17:03:37 -0700 (PDT)

> See the difference? You literally merged four times in two days. That's
> not "keeping reasonably up-to-date", that's just messy and OCD.

Have a look at my networking tree if you want to see an example of how
to handle things Thomas.

I think I merged from Linus's tree only 3 or 4 times maximum since I
created that tree way back when the 2.6.26 merge window opened up.

If users, or even you, want to get a bug fix from Linus's tree or check
if there will be merge conflicts, just create a test branch and play
with such things there.

The topic branch or topic tree should just keep developing,
essentially living in it's own world oblivious to what is going on
upstream. And it should stay this way until an unavoidable merge
conflict needs to be resolved or things become uncomfortably out of
sync.


\
 
 \ /
  Last update: 2008-05-17 02:31    [W:0.051 / U:3.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site