merge: ~stoth/pci-nano

From: Michael Krufky <mkrufky@linuxtv.org>

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>

1 files changed, 21 insertions, 5 deletions

diff --git a/README.patches b/README.patches
index 863415cc8..3ee55ff29 100644
--- a/README.patches
+++ b/README.patches
@@ -1,5 +1,5 @@
 Mauro Carvalho Chehab <mchehab at infradead dot org>
-					Updated on 2007 December, 1st
+					Updated on 2008 February, 14
 
 This file describes the general procedures used by the LinuxTV team (*)
 and by the v4l-dvb community.
@@ -46,8 +46,8 @@ finally merged into a common repository on linuxtv.org.
 A list of current available repositories is available at:
 	http://linuxtv.org/hg
 
-2. Git trees' relationships with v4l/dvb development
-   =================================================
+2. Git and Mercurial trees' relationships with v4l/dvb development
+   ===============================================================
 
 The main kernel trees are hosted at http://git.kernel.org. Each tree
 is owned by a maintainer.
@@ -59,6 +59,20 @@ The subsystem master tree is owned by the subsystem maintainer (Mauro
 Carvalho Chehab) being located at:
 	http://git.kernel.org/?p=linux/kernel/git/mchehab/v4l-dvb.git
 
+There's also an experimental tree, that contains all experimental patches
+from subsystem trees. It is called linux-next. Its purpose is to check in
+advance if patches from different trees would conflict. The main tree for
+linux-next is owned by Stephen Rothwell and it is located at:
+	http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git
+
+Warning: linux-next is meant to be used by developers. As it may contain broken
++++++++  patches on several subsystems, it may cause damage if used on
+	 production systems.
+
+The subsystem linux-next tree is also owned by Mauro Carvalho Chehab, and it is
+located at:
+	http://www.kernel.org/git/?p=linux/kernel/git/mchehab/linux-next.git
+
 Before committing into the master -git tree, the finished patches from
 each maintainers tree are added on a staging tree, owned by the
 subsystem maintainer, at:
@@ -66,6 +80,8 @@ subsystem maintainer, at:
 
 The main function of this tree is to merge patches from other
 repositories and to test the entire subsystem with the finished patches.
+This is also the recommended tree for users interested on testing newer V4L/DVB
+patches and drivers.
 
 Users are welcome to use, test and report any issues via the mailing
 lists or via the Kernel's bugzilla, available at:
@@ -76,8 +92,8 @@ patches from the subsystem tree that are meant to be sent to kernel
 -stable team, at:
 	http://git.kernel.org/http://git.kernel.org/?p=linux/kernel/git/mkrufky/v4l-dvb-2.6.x.y.git
 
-3. Mercurial trees used for v4l/dvb development
-   ============================================
+3. Other mercurial trees used for v4l/dvb development
+   ==================================================
 
 V4L/DVB driver development is hosted at http://linuxtv.org. There are a
 number of trees there each owned by a developer of the LinuxTV team.