README

   1 thinkpad-acpi development tree
   2 ==============================
   3
   4 NOTE: The ibm-acpi driver was renamed to thinkpad-acpi on 2007-03,
   5 and this rename was merged for Linux mainline 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/ibm-acpi/: staging area with patches from thinkpad-acpi development
  22
  23
  24 sf.net/: Files for ibm-acpi.sf.net
  25
  26 ibm-acpi git tree
  27 =================
  28
  29 Branch                  Description
  30 ------                  ---------------------------------------------
  31 master                  thinkpad-acpi development tree, see above.
  32
  33 release/*               thinkpad-acpi releases for various kernels.
  34
  35 for-upstream/
  36         mm              thinkpad-acpi patches queued to be added to
  37                         -mm tree, for please pull requests to Andrew.
  38                         CURRENTLY UNUSED as -mm submission is being
  39                         done through acpi-test.
  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.
  54
  55   waiting               patches waiting to be sent or merged upstream.
  56
  57 devel                   Current work (not yet complete or stable)
  58
  59
  60 Typical patch flow:
  61         hmh -> Len (acpi-test) -> mm -> Len (acpi-release) -> Linus
  62
  63 For 2.6.23 onwards, non-bug-fix patches will only be sent to mainline
  64 during the merge window.
  65
  66 When in doubt, ask ibm-acpi-devel@lists.sourceforge.net.
  67
  68 Bug reports, comments, new patches, etc are welcome at
  69 ibm-acpi-devel@lists.sourceforge.net.
  70
  71 Contact me directly at ibm-acpi@hmh.eng.br.
  72
  73 -- Henrique de Moraes Holschuh <hmh@hmh.eng.br>