docs: add info about branches; update travis.yml

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/.travis.yml b/.travis.yml
index 169596c64246d5203eead51c7f849676023ccdaa..a4f51f3ed0e02b63ef84dbc40630b7e3a0ca00bb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,9 @@ matrix:
 branches:
   only:
     - master
+    - next
     - /^stable.*/
+    - /^topic.*/
     - /^travis.*/
 
 before_install:

diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index e63d390c4e3368729c10bc450be1848037a0df7f..206ff582cb1e00105c829bc87b0dff7860d561ec 100644 (file)
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -35,6 +35,29 @@ Sending Patches
          Packages like RPMs, DEBs, and the rest, are not provided. They should
          be available from the distribution.
 
+Repositories & Branches
+
+       * Primary repository is on kernel.org:
+          git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
+
+         We use this repository for master and stable branches only.
+
+       * Backup repository at github.com:
+         git clone git://github.com/karelzak/util-linux.git
+
+         We use this repository to backup kernel.org and for pull requests,
+         issues tracking and topic branches. The master and stable branches are
+         always pushed to the both repositories in the same time.
+
+         It's recommended to use github.com for development.
+
+       * Branches:
+
+         master        - development for the next release
+         next          - optionally used when master branch is frozen due to -rcN releases
+         topic/*       - long time development
+         stable/*      - stable maintenance releases
+
 Patching Process
 
        * announce it on the mailing list when you are going to work with some