From 9fbb10bf3b72fffc956bbd294ab59c5e8434a12c Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Fri, 23 Feb 2007 18:12:28 -0200 Subject: [PATCH] Explain the new queue/* and devel branches, and improve the descriptions of the other branches. Signed-off-by: Henrique de Moraes Holschuh --- README | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README b/README index d7f9ebeb431..6392d755b60 100644 --- a/README +++ b/README @@ -26,26 +26,33 @@ ibm-acpi git tree Branch Description ------ --------------------------------------------- -master ibm-acpi patch archive and work area +master ibm-acpi development tree, see above. -release/* ibm-acpi releases for various kernels +release/* ibm-acpi releases for various kernels. for-upstream/ mm ibm-acpi patches queued to be added to -mm tree, - for please pull requests to Andrew + for please pull requests to Andrew. acpi-test ibm-acpi patches queued to be added to Len's - acpi-test tree, for please pull requests to Len + acpi-test tree, for please pull requests to Len. + This is the normal submission path upstream. acpi-release ibm-acpi patches queued to be added to mainline (through Len's acpi-release tree), for please - pull requests to Len + pull requests to Len. Rarely used. -upstream/* various upstream trees +upstream/* various upstream trees. queue/ patch queue for the next ibm-acpi release - already-upstream patches already sent upstream (acpi-test) - waiting patches waiting to be sent or merged upstream + already-upstream patches already merged upstream (acpi-test), + patches are removed when they hit mainline or + a sourceforge release is made. + + waiting patches waiting to be sent or merged upstream. + +devel Current work (not yet complete or stable) + Typical patch flow: hmh -> Len (acpi-test) -> mm -> Len (acpi-release) -> Linus -- 2.11.4.GIT