public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Vegard Nossum <vegard.nossum@gmail.com>
Cc: linux-kernel@vger.kernel.org,
	the arch/x86 maintainers <x86@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH] x86: more header fixes
Date: Tue, 1 Jul 2008 11:28:20 +0200	[thread overview]
Message-ID: <20080701092820.GA31309@elte.hu> (raw)
In-Reply-To: <19f34abd0806260953h504ff85dmf11a59171df3442b@mail.gmail.com>


* Vegard Nossum <vegard.nossum@gmail.com> wrote:

> > or perhaps we could include it in tip/master right now as well, if 
> > you did another branch that excluded the files below. That would 
> > make merging a lot easier - and we could do a second phase in 
> > v2.6.27-rc1. Hm?
> 
> I don't think we really need to resolve conflicts at all. What we can 
> do is simply to re-run the scripts against tip/master whenever you 
> want the update.

ok, lets do it that way.

> Also, by the way: Can -tip now be cloned with --shared to save space 
> as long as I only have branches with references to commits in 
> tip/master? Or is this still to be considered unsafe?

it's unsafe if we ever rewind a commit that you rely on later, and 
git-gc zaps it from tip.git?

i think it would be better to not rely on that yet. The overwhelming 
majority of activities in tip.git are append-only, but the integration 
branches (which are included in tip/master) get regenerated frequently. 
If you base on a topic branch itself (say tip/x86/nmi) - that should be 
pretty stable.

	Ingo

  reply	other threads:[~2008-07-01  9:28 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-10 21:45 [PATCH] x86: more header fixes Vegard Nossum
2008-06-18 10:30 ` Ingo Molnar
2008-06-18 16:19   ` Vegard Nossum
2008-06-26 12:02     ` Ingo Molnar
2008-06-26 13:30       ` Sam Ravnborg
2008-06-26 13:44         ` Vegard Nossum
2008-06-26 17:30           ` Sam Ravnborg
2008-06-26 16:53       ` Vegard Nossum
2008-07-01  9:28         ` Ingo Molnar [this message]
2008-07-16 11:51           ` Ingo Molnar
2008-07-16 12:50             ` Vegard Nossum
2008-07-16 13:08               ` Ingo Molnar
2008-07-16 13:17                 ` Ingo Molnar
2008-07-16 13:46                   ` Vegard Nossum
2008-07-16 14:22                     ` Ingo Molnar
2008-07-22 12:32                       ` Vegard Nossum
2008-07-22 10:36                         ` Ingo Molnar
2008-07-22 11:13                           ` Vegard Nossum
2008-07-22 11:38                             ` Ingo Molnar
2008-07-22 18:27                               ` Vegard Nossum
2008-07-26 13:08                                 ` Ingo Molnar

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=20080701092820.GA31309@elte.hu \
    --to=mingo@elte.hu \
    --cc=a.p.zijlstra@chello.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=vegard.nossum@gmail.com \
    --cc=x86@kernel.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