From: Thomas Gleixner <tglx@linutronix.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ingo Molnar <mingo@elte.hu>, David Miller <davem@davemloft.net>,
linux-kernel@vger.kernel.org, hpa@zytor.com
Subject: Re: [GIT pull] x86 fixes for 2.6.26
Date: Sat, 17 May 2008 23:02:03 +0200 (CEST) [thread overview]
Message-ID: <alpine.LFD.1.10.0805172258110.18798@apollo.tec.linutronix.de> (raw)
In-Reply-To: <alpine.LFD.1.10.0805171256430.3020@woody.linux-foundation.org>
On Sat, 17 May 2008, Linus Torvalds wrote:
> On Sat, 17 May 2008, Ingo Molnar wrote:
> >
> > We've solved it by still doing the merges (we _need_ the information
> > about potential upcoming merge trouble), but we dont commit them to the
> > topic branches - we throw them away.
>
> And that is *absolutely* the right thing to do.
>
> Poeple need to test the different topic branches together some way anyway,
> regardless of upcoming merge trouble, so yes, when you have more than one
> branch, you inevitably need to have a "test branch" that ties them all
> together for testing the end result (and that test branch generally would
> be a throw-away one, like linux-next. In fact, it could *be* linux-next,
> but there's good reason for you to test your own branches together rather
> than waiting for an external entity to notice that your branches don't
> work together).
>
> So yes, sounds good.
In meantime - until we sorted out our new git life - can you please
pull the fixes without the noisy merge commits (resolved by rebasing
to keep thing rolling) from:
ssh://master.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
Thanks,
tglx
next prev parent reply other threads:[~2008-05-17 21:08 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
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 [this message]
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=alpine.LFD.1.10.0805172258110.18798@apollo.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--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®