From: David Miller <davem@davemloft.net>
To: torvalds@linux-foundation.org
Cc: tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@elte.hu,
hpa@zytor.com
Subject: Re: [GIT pull] x86 fixes for 2.6.26
Date: Fri, 16 May 2008 17:28:35 -0700 (PDT) [thread overview]
Message-ID: <20080516.172835.260358594.davem@davemloft.net> (raw)
In-Reply-To: <alpine.LFD.1.10.0805161658450.3020@woody.linux-foundation.org>
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.
next prev parent reply other threads:[~2008-05-17 0:28 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-16 22:38 Thomas Gleixner
2008-05-16 22:47 ` Linus Torvalds
2008-05-16 22:51 ` Linus Torvalds
2008-05-16 23:44 ` Thomas Gleixner
2008-05-17 0:03 ` Linus Torvalds
2008-05-17 0:28 ` David Miller [this message]
2008-05-17 1:38 ` Linus Torvalds
2008-05-17 19:39 ` Ingo Molnar
2008-05-17 20:00 ` Linus Torvalds
2008-05-17 21:02 ` Thomas Gleixner
2008-05-17 21:36 ` Linus Torvalds
2008-05-17 1:57 ` Theodore Tso
2008-05-17 3:19 ` Linus Torvalds
2008-05-17 14:58 ` Theodore Tso
2008-05-17 17:05 ` Linus Torvalds
2008-05-17 20:37 ` Thomas Gleixner
2008-05-17 20:26 ` Junio C Hamano
2008-05-17 22:45 ` Jesper Juhl
2008-05-18 0:35 ` Linus Torvalds
2008-05-18 2:22 ` Stephen Rothwell
2008-05-18 22:09 ` Jesper Juhl
2008-05-18 22:26 ` Linus Torvalds
2008-05-20 0:01 ` Jesper Juhl
2008-05-23 21:49 Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080516.172835.260358594.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®