From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y29wd-0006yn-48 for linux-mtd@lists.infradead.org; Sat, 20 Dec 2014 02:39:07 +0000 Received: by mail-pa0-f50.google.com with SMTP id bj1so2318765pad.37 for ; Fri, 19 Dec 2014 18:38:39 -0800 (PST) From: Brian Norris To: Subject: [PATCH mtd-www 2/4] source: update git tree information Date: Fri, 19 Dec 2014 18:38:24 -0800 Message-Id: <1419043106-16453-2-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1419043106-16453-1-git-send-email-computersforpeace@gmail.com> References: <1419043106-16453-1-git-send-email-computersforpeace@gmail.com> Cc: Brian Norris , David Woodhouse , Artem Bityutskiy List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Include information about the l2-mtd.git and linux-ubifs.git trees, and add a nice table to catalog them. Signed-off-by: Brian Norris --- doc/git.xml | 8 +++--- source.xml | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/doc/git.xml b/doc/git.xml index d22ef8ec6cb4..c3d0b88b87f8 100644 --- a/doc/git.xml +++ b/doc/git.xml @@ -11,10 +11,8 @@

MTD GIT HOWTO

-

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

The MTD GIT trees are documented here +and can be browsed through the gitweb interface at http://git.infradead.org/.

@@ -25,7 +23,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 linux-mtd git tree, +Anything you commit should be on top of the development tree (see here), rather than against a clean tree from Linus. Avoid doing any merges of your own, unless absolutely necessary.

diff --git a/source.xml b/source.xml index 01c359fd20d4..a557a23d45f7 100644 --- a/source.xml +++ b/source.xml @@ -10,12 +10,88 @@

GIT vs. Linux 3.x

-

The MTD GIT tree is git://git.infradead.org/linux-mtd.git, - and is viewable using gitweb at MTD development is kept in GIT and managed according to standard Linux + development practices. Development is based off of one of several trees, + depending on what you're targeting. For MTD development, patches are kept + in the linux-mtd.git and l2-mtd.git repositories. The + former targets the current release cycle (use this only for bugfixes other + material that's worthy of rapid integration into Linus' tree), while the + latter targets the next Linux release (use this for most development). + UBI and UBIFS development is tracked separately, in + linux-ubifs.git. User-space tools are kept in + mtd-utils.git.

+ +

All of the kernel trees are included in the + linux-next + tree and are viewable using gitweb at http://git.infradead.org/, along - with a separate tree for the userspace tools, and users' own trees. - From time to time, other trees will exist which contain development work - which is not yet ready to be merged with the mainstream kernel.

+ with a separate tree for the userspace tools, and users' own trees.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Tree NameGIT URLGitweb URL
+ MTD + + git://git.infradead.org/linux-mtd.git + + + http://git.infradead.org/linux-mtd.git +
+ MTD (next) + + git://git.infradead.org/l2-mtd.git + + + http://git.infradead.org/l2-mtd.git +
+ UBI / UBIFS + + git://git.infradead.org/linux-ubifs.git + + + http://git.infradead.org/linux-ubifs.git +
+ MTD user-space tools + + git://git.infradead.org/mtd-utils.git + + + http://git.infradead.org/mtd-utils.git +
+ This website + + git://git.infradead.org/mtd-www.git + + + http://git.infradead.org/mtd-www.git +

Gitweb can give patches between specific points in the tree. To obtain the full patch between Linus' official kernel tree and the @@ -59,6 +135,10 @@ different machine to the old cvs.infradead.org) may send trivial patche to the mailing list -- but expect to be given an account and expected to use git if you make a habit of it.

+

If you are sending patches to the mailing list, +please remember to base them on the appropriate tree listed above, not Linus' +tree.

+

Patch Format Guidelines

In order to make the lives of the patchmonkeys/maintainers easier, a few -- 1.9.1