aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2016-10-25 16:28:50 +0100
committerJames Hogan <james.hogan@imgtec.com>2016-10-25 16:32:59 +0100
commitb0b0c09803c29a7778383761ff0ab31dbf106476 (patch)
tree87ec2e1d61b2e14349bb56048ff9f660dcb32f56
parente25da9b6f34243a38de654c12becdf47e01ebdc3 (diff)
downloadkvm-mips-__about__.tar.gz
README: Add description of master branch__about__
Add info about the master branch, which is for fixes for the current release, and elaborate about what the branches are based on. Signed-off-by: James Hogan <james.hogan@imgtec.com>
-rw-r--r--README15
1 files changed, 14 insertions, 1 deletions
diff --git a/README b/README
index 5fe38ce33784d..4226600d87c0c 100644
--- a/README
+++ b/README
@@ -12,6 +12,19 @@ https://www.linux-mips.org/wiki/KVM
The main branches are as follows:
+master:
+ This branch contains the queue of KVM/MIPS fixes for the current
+ release, based on the master branch of:
+
+ git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+
+ This branch may occasionally be rebased, and may be merged into the next
+ branch.
+
next:
- This branch contains the queue of KVM/MIPS patches for the next release.
+ This branch contains the queue of KVM/MIPS patches for the next release
+ (including fixes for the current release), based on the next branch of:
+
+ git://git.kernel.org/pub/scm/virt/kvm/kvm.git
+
This branch may occasionally be rebased, and is included in linux-next.