README

   1 thinkpad-acpi development tree
   2 ==============================
   3
   4 NOTE: The ibm-acpi driver was renamed to thinkpad-acpi on 2007-03,
   5 with changes scheduled to hit Linux mainline for 2.6.22.
   6
   7
   8 This tree is an staging and archival area for ibm-acpi patches and
   9 documentation.
  10
  11 releases/: archival area
  12
  13 releases/upstream/:  directory containing the patches in public releases
  14         of thinkpad-acpi and ibm-acpi
  15
  16 releases/upstream/sunrise/: reference (base) version of ibm-acpi
  17
  18 rejected/: staging area for rejected/superseeded/abandoned patches
  19
  20 queues/: various staging areas
  21 queues/acpi-test/: staging area with patches that made it to acpi-test
  22 queues/ibm-acpi/: staging area with patches from thinkpad-acpi development
  23 queues/for-upstream/: staging area with patches being submitted upstream
  24
  25
  26 sf.net/: Files for ibm-acpi.sf.net
  27
  28 ibm-acpi git tree
  29 =================
  30
  31 Branch                  Description
  32 ------                  ---------------------------------------------
  33 master                  thinkpad-acpi development tree, see above.
  34
  35 release/*               thinkpad-acpi releases for various kernels.
  36
  37 for-upstream/
  38         mm              thinkpad-acpi patches queued to be added to
  39                         -mm tree, for please pull requests to Andrew.
  40
  41         acpi-test       thinkpad-acpi patches queued to be added to Len's
  42                         acpi-test tree, for please pull requests to Len.
  43                         This is the normal submission path upstream.
  44
  45         acpi-release    thinkpad-acpi patches queued to be added to
  46                         mainline (through Len's acpi-release tree), for
  47                         please pull requests to Len.  Rarely used.
  48
  49 upstream/*              various upstream trees.
  50
  51 queue/                  patch queue for the next thinkpad-acpi release
  52   already-upstream      patches already merged upstream (acpi-test),
  53                         patches are removed when they hit mainline or
  54                         a sourceforge release is made.
  55
  56   waiting               patches waiting to be sent or merged upstream.
  57
  58 devel                   Current work (not yet complete or stable)
  59
  60
  61 Typical patch flow:
  62         hmh -> Len (acpi-test) -> mm -> Len (acpi-release) -> Linus
  63
  64 When in doubt, ask ibm-acpi-devel@lists.sourceforge.net.
  65
  66 Bug reports, comments, new patches, etc are welcome at
  67 ibm-acpi-devel@lists.sourceforge.net.
  68
  69 Contact me directly at ibm-acpi@hmh.eng.br.
  70
  71 -- Henrique de Moraes Holschuh <hmh@hmh.eng.br>