From: Brian Norris Date: Sat, 5 May 2012 04:04:58 +0000 (-0700) Subject: doc: update info for Linux 3.0 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d5aa52598fabc41248bdad65d3082814c4292a0b;p=mtd-www.git doc: update info for Linux 3.0 Although 'linux-2.6.git' is still a valid repository, the preferred name is just 'linux.git', now that Linux has reached version 3.x. And David also has his repository under 'linux-mtd.git' now, so we might as well redirect to the modern naming. So: linux-2.6.git -> linux.git mtd-2.6.git -> linux-mtd.git Signed-off-by: Brian Norris Cc: David Woodhouse Signed-off-by: Artem Bityutskiy --- diff --git a/doc/git.xml b/doc/git.xml index 2de93d9..d22ef8e 100644 --- a/doc/git.xml +++ b/doc/git.xml @@ -11,9 +11,9 @@

MTD GIT HOWTO

-

The MTD GIT tree is at git://git.infradead.org/mtd-2.6.git, +

The MTD GIT tree is at git://git.infradead.org/linux-mtd.git, and is visible through gitweb. Other git +HREF="http://git.infradead.org/?p=linux-mtd.git">gitweb. Other git trees are available and can be browsed through the gitweb interface at http://git.infradead.org/.

@@ -25,7 +25,7 @@ job runs every five minutes, indexing the available trees in users' gitweb.

When creating GIT trees with patches you intend to be pushed upstream, please try to ensure that we end up with as few merges as possible. -Anything you commit should be on top of the latest mtd-2.6 git tree, +Anything you commit should be on top of the latest linux-mtd git tree, rather than against a clean tree from Linus. Avoid doing any merges of your own, unless absolutely necessary.

@@ -66,19 +66,19 @@ directory by cloning from the existing trees which are in /srv/git 
 $ cd ~/public_git
-$ git clone -l -n -s --bare /srv/git/mtd-2.6.git foo-2.6.git
-$ echo 'this is my tree for playing with foobar' > foo-2.6.git/description
+$ git clone -l -n -s --bare /srv/git/linux-mtd.git foo.git
+$ echo 'this is my tree for playing with foobar' > foo.git/description

Your new tree will be immediately accessible to the public through the -URL git://git.infradead.org/~<I>user</I>/foo-2.6.git. +URL git://git.infradead.org/~<I>user</I>/foo.git.

Within five minutes of its creation, your tree should be visible through the gitweb interface too.

You can then make a local clone of your public tree (as shown below), make commits to it and push them back. For this, use the URL -ssh://git.infradead.org/~/public_git/foo-2.6.git.

+ssh://git.infradead.org/~/public_git/foo.git.

Note: The git d&aelig;mon exports each user's public_git directory as git://git.infradead.org/~user &mdash; just as httpd would @@ -93,17 +93,17 @@ make commits to it and push them back. For this, use the URL

Clone Linus' tree

If you don't already have a copy of Linus' tree locally, get one: -
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git linux-2.6
+
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linux

Clone MTD tree

Using Linus' tree as a reference for existing objects, clone the MTD tree: -
$ git clone --reference linux-2.6 git://git.infradead.org/mtd-2.6.git mtd-2.6
+
$ git clone --reference linux git://git.infradead.org/linux-mtd.git linux-mtd

Clone your own tree

Now using the MTD tree as a reference for existing objects, clone your own tree from your public_git directory: -
$ git clone --reference mtd-2.6 ssh://git.infradead.org/~/public_git/foo-2.6.git myfoo-2.6
+
$ git clone --reference linux-mtd ssh://git.infradead.org/~/public_git/foo.git myfoo
Having cloned your tree, you can now commit to it using git-commit and push the results back with git-push. @@ -114,7 +114,7 @@ In general, I would advise that you avoid branches; especially on the server much less complicated to deal with.

However, it is useful to keep a 'branch' in your tree for each upstream repository that you -pull from. The mtd-2.6.git tree has such a branch called +pull from. The linux-mtd.git tree has such a branch called 'linus' which shows the last merge from Linus' master kernel tree, thus allowing operations like git-diff linus.. to work easily, and helping the the script which feeds the commits list to diff --git a/source.xml b/source.xml index 3df28da..faba4a1 100644 --- a/source.xml +++ b/source.xml @@ -8,9 +8,9 @@ -

GIT vs. Linux 2.6.x

+

GIT vs. Linux 3.x

-

The MTD GIT tree is git://git.infradead.org/mtd-2.6.git, +

The MTD GIT tree is git://git.infradead.org/linux-mtd.git, and is viewable using gitweb at http://git.infradead.org/, along with a separate tree for the userspace tools, and users' own trees. @@ -20,7 +20,7 @@

Gitweb can give patches between specific points in the tree. To obtain the full patch between Linus' official kernel tree and the current MTD tree, use the following URL: http://git.infradead.org/?p=mtd-2.6.git;a=commitdiff_plain;h=master;hp=linus. This + HREF="http://git.infradead.org/?p=linux-mtd.git;a=commitdiff_plain;h=master;hp=linus">http://git.infradead.org/?p=linux-mtd.git;a=commitdiff_plain;h=master;hp=linus. This produces a full patch from the branch known as 'linus' in the git repository, which represents the last point at which Linus' official kernel tree was merged into the MTD git tree. This @@ -33,11 +33,11 @@ of Linus' official kernel tree, share the object directory with that instead of downloading the same objects all over again. With GIT 1.3.0 and onwards, that's simple enough. Assuming you have a local tree named - '~/git/linux-2.6' already, you can clone the MTD tree as follows: - 

-git-clone --reference ~/git/linux-2.6 git://git.infradead.org/mtd-2.6
-
-

+ '~/git/linux' already, you can clone the MTD tree as follows:

+

+git clone --reference ~/git/linux git://git.infradead.org/linux-mtd.git +

+

Users with accounts on git.infradead.org can create their own trees there, which are also accessible via public git:// URLs and visible in gitweb. For more details see the GIT HOWTO.

@@ -51,7 +51,7 @@ gitweb. For more details see the GIT HOWTO.

If you have the facility to do so, please create a temporary git tree from which patches can be pulled. The GIT HOWTO documents how to do this. Please make sure that any such -such GIT trees are based on the current mtd-2.6 GIT tree and not on +such GIT trees are based on the current linux-mtd GIT tree and not on Linus' tree, so that unnecessary merges are avoided.

Users without an account on git.infradead.org (which is a @@ -90,7 +90,7 @@ Signed-off-by: Realname &lt;realmail&gt;

Kernel versions

The MTD code in the linux kernel is updated from the MTD GIT tree -in kernel version 2.6.newest only. The 2.4 kernel does not +in kernel version 3.x (newest) only. The 2.4 kernel does not have NAND support in JFFS2, and will not have anything but high-priority bug-fixes applied to it.

As of March 2005 we dropped Linux 2.4 support from CVS head. This