Explain the two new queue/ branches in the git tree.
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / README
blobd7f9ebeb4319e37c9c42c388c7f4a573600b229c
1 ibm-acpi development tree
2 =========================
4 This tree is an staging and archival area for ibm-acpi patches and
5 documentation.
7 releases/: archival area
9 releases/upstream/:  directory containing the patches in public releases
10         of ibm-acpi
12 releases/upstream/sunrise/: reference (base) version of ibm-acpi
14 rejected/: staging area for rejected/superseeded/abandoned patches
16 queues/: various staging areas
17 queues/acpi-test/: staging area with patches that made it to acpi-test
18 queues/ibm-acpi/: staging area with patches from ibm-acpi development
19 queues/for-upstream/: staging area with patches being submitted upstream
22 sf.net/: Files for ibm-acpi.sf.net
24 ibm-acpi git tree
25 =================
27 Branch                  Description
28 ------                  ---------------------------------------------
29 master                  ibm-acpi patch archive and work area
31 release/*               ibm-acpi releases for various kernels
33 for-upstream/
34         mm              ibm-acpi patches queued to be added to -mm tree,
35                         for please pull requests to Andrew
37         acpi-test       ibm-acpi patches queued to be added to Len's
38                         acpi-test tree, for please pull requests to Len
40         acpi-release    ibm-acpi patches queued to be added to mainline
41                         (through Len's acpi-release tree), for please
42                         pull requests to Len
44 upstream/*              various upstream trees
46 queue/                  patch queue for the next ibm-acpi release
47   already-upstream      patches already sent upstream (acpi-test)
48   waiting               patches waiting to be sent or merged upstream
50 Typical patch flow:
51         hmh -> Len (acpi-test) -> mm -> Len (acpi-release) -> Linus
53 When in doubt, ask ibm-acpi-devel@lists.sourceforge.net.
55 Bug reports, comments, new patches, etc are welcome at
56 ibm-acpi-devel@lists.sourceforge.net.
58 Contact me directly at ibm-acpi@hmh.eng.br.
60 -- Henrique de Moraes Holschuh <hmh@hmh.eng.br>