public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Mike Travis <travis@sgi.com>
Cc: Yinghai Lu <yinghai@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] x86: arch_probe_nr_irqs
Date: Wed, 14 Jan 2009 21:11:52 +0100	[thread overview]
Message-ID: <20090114201152.GA31581@elte.hu> (raw)
In-Reply-To: <496E4211.6040503@sgi.com>


* Mike Travis <travis@sgi.com> wrote:

>     mkdir linux-2.6-cpus4096-for-ingo
>     cd linux-2.6-cpus4096-for-ingo
>     git-init-db
>     git-remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
>     git-remote add tip git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
>     git-remote add my-cpus4096 git://git.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git
>     git-remote add push-cpus4096 ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo.git
>     git-config --add remote.push-cpus4096.skipDefaultUpdate true
>     git-remote update

hm, why do you do all this? You should just create a -git based repo on 
kernel.org:

  cd /pub/scm/linux/kernel/git/travis/
  rm -rf linux-2.6-cpus4096-for-ingo
  git-clone --bare --shared ../torvalds/linux-2.6.git linux-2.6-cpus4096-for-ingo

that's all - you dont ever have to touch the master.kernel.org bits on 
that box anymore. Then you can clone it (via ssh) to your local box:

  git clone ssh://master.kernel.org/pub/scm/linux/kernel/git/travis/linux-2.6-cpus4096-for-ingo

that's it - you are all set!

Now you can go into your repo, and do a few convenience things like:

     git-remote add linus git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
     git-remote add tip git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git

     git remote update

But these dont ever go to your master.kernel.org tree. Your local 'master' 
branch is what you will push out most of the time.

To prepare a tree for me, if you want to base it on the latest 
tip/cpus4096, you do this:

     git checkout master
     git reset --hard tip/cpus4096

that's all. You can then (force-)push this out to your kernel.org repo 
via:

     git push -f origin master

and you can manipulate your master branch and push it out to your 
master.kernel.org repo whenever you want to.

If you want a separate 'release' branch, you can do it too:

   git checkout master

   [ prepare your master branch with the bits. ]

   git checkout -b for-ingo
   git push origin for-ingo

   [ git checkout master ]

That's it. If the for-ingo branch already exists and you know that it 
contains no bits that i might pull in parallel with you updating it, you 
can force-push it as well:

   git checkout for-ingo
   git reset --hard master          # set it to your release bits
   git push -f origin for-ingo

that's it really.

	Ingo

  reply	other threads:[~2009-01-14 20:12 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-12  5:42 [PATCH] x86: include apicnum.h in acpidef.h Yinghai Lu
2009-01-12  9:19 ` Ingo Molnar
2009-01-12  9:26   ` Ingo Molnar
2009-01-12  9:27     ` Ingo Molnar
2009-01-12 19:53     ` [PATCH] x86: arch_probe_nr_irqs Yinghai Lu
2009-01-12 23:07       ` Mike Travis
2009-01-14 11:19         ` Ingo Molnar
2009-01-14 19:50           ` Mike Travis
2009-01-14 20:11             ` Ingo Molnar [this message]
2009-01-14 21:26               ` Mike Travis
2009-01-15  9:49                 ` Ingo Molnar
2009-01-15 20:53                   ` Mike Travis
2009-01-15 21:02                     ` Ingo Molnar
2009-01-12 19:09 ` [PATCH] x86: include apicnum.h in acpidef.h Mike Travis

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=20090114201152.GA31581@elte.hu \
    --to=mingo@elte.hu \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=travis@sgi.com \
    --cc=yinghai@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