Update driver maintenance/status for upcoming 7.7 katamari

MAINTAINERS:
- Add driver-specific mailing lists & web pages for ATI, Intel & Geode
- Add driver entries for geode, nested, qxl, and xgixp drivers
- Mark cyrix, nsc, & via as obsolete

Release Notes:
- Move drivers not being included in katamari from drivers table to
  removed table
- Update README links to use .txt since drivers no longer generate
  html READMEs from SGML

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

2 files changed, 66 insertions, 109 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 4b7814d..1c61372 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16,7 +16,7 @@ by component within each subsystem, rather than alphabetically on maintainer
 name.
 
 P: Person
-M: Mail patches to
+M: Mail patches to (but cc the mailing list as well)
 L: Mailing list that is relevant to this area
 W: Web-page with status/info
 S: Status, one of the following:
@@ -756,7 +756,7 @@ P:	Alex Deucher
 P:      Ben Herrenschmidt
 P:      et al
 M:	?
-L:	xorg-devel@lists.x.org
+L:	xorg-driver-ati@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
@@ -777,9 +777,9 @@ S:	Unmaintained
 xf86-video-cyrix
 P:	?
 M:	?
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
-S:	Unmaintained
+L:	xorg-driver-geode@lists.x.org
+W:	http://www.x.org/wiki/GeodeDriver
+S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-dummy
 P:	Adam Jackson
@@ -795,6 +795,14 @@ L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Unmaintained
 
+xf86-video-geode
+P:	?
+M:	?
+L:	xorg-driver-geode@lists.x.org
+W:	http://lists.x.org/mailman/listinfo/xorg-driver-geode
+W:	http://www.x.org/wiki/GeodeDriver
+S:	Maintained
+
 xf86-video-glide
 P:	Guillem Jover
 M:	guillem@hadrons.org
@@ -827,14 +835,14 @@ S:	Unmaintained
 xf86-video-intel
 P:	Eric Anholt
 M:	eric@anholt.net
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
-S:	Maintained
+L:	intel-gfx@lists.freedesktop.org
+W:	http://intellinuxgraphics.org/
+S:	Supported
 
 xf86-video-mach64
 P:      Luc Verhaegen
 M:      libv@skynet.be
-L:      xorg-devel@lists.x.org
+L:	xorg-driver-ati@lists.x.org
 W:      http://wiki.x.org
 S:	Maintained
 
@@ -866,6 +874,13 @@ L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xf86-video-nested
+P:	?
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
 xf86-video-newport
 P:	?
 M:	?
@@ -876,9 +891,9 @@ S:	Unmaintained
 xf86-video-nsc
 P:	Alan Hourihane
 M:	alanh@fairlite.demon.co.uk
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
-S:	Maintained
+L:	xorg-driver-geode@lists.x.org
+W:	http://www.x.org/wiki/GeodeDriver
+S:	Obsolete - mostly replaced by xf86-video-geode
 
 xf86-video-nv
 P:	Aaron Plattner
@@ -887,6 +902,13 @@ L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xf86-video-qxl
+P:	?
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Maintained
+
 xf86-video-rendition
 P:	Adam Jackson
 M:	ajax@nwnk.net
@@ -899,17 +921,17 @@ P:	Alex Deucher
 P:      Ben Herrenschmidt
 P:      et al
 M:	?
-L:	xorg-devel@lists.x.org
+L:	xorg-driver-ati@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
-xf86-video-radeon
+radeon driver (xf86-video-ati)
 P:	Alex Deucher
 P:      Ben Herrenschmidt
 P:      et al
 M:	?
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
+L:	xorg-driver-ati@lists.x.org
+W:	http://www.x.org/wiki/radeon
 S:	Maintained
 
 xf86-video-s3
@@ -1046,20 +1068,10 @@ W:	http://wiki.x.org
 S:	Maintained
 
 xf86-video-vga
-P:	?
-M:	?
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
 S:	Obsolete - use xf86-video-vesa instead
 
 xf86-video-via
-P:	Luc Verhaegen
-P:      Thomas Hellström
-M:	?
-L:	xorg-devel@lists.x.org
-W:	http://wiki.x.org
-W:      http://unichrome.sf.net
-S:	Unmaintained
+S:	Obsolete - use xf86-video-openchrome or xf86-video-unichrome instead
 
 xf86-video-vmware
 P:	Thomas Hellstrom
@@ -1089,6 +1101,13 @@ L:	xorg-devel@lists.x.org
 W:	http://wiki.x.org
 S:	Maintained
 
+xf86-video-xgixp
+P:	?
+M:	?
+L:	xorg-devel@lists.x.org
+W:	http://wiki.x.org
+S:	Unmaintained
+
 Other modules
 -------------
 
diff --git a/general/ReleaseNotes.xml b/general/ReleaseNotes.xml
index 4a7ba1d..968a9ff 100644
--- a/general/ReleaseNotes.xml
+++ b/general/ReleaseNotes.xml
@@ -312,11 +312,6 @@ The next section describes what is new in the latest version
         </thead>
         <tbody>
             <row>
-                <entry><literal remap="tt">apm</literal></entry>
-                <entry>Alliance Pro Motion</entry>
-                <entry><ulink url="apm.html">README.apm</ulink></entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">ark</literal></entry>
                 <entry>Ark Logic</entry>
                 <entry>&nbsp;</entry>
@@ -327,13 +322,6 @@ The next section describes what is new in the latest version
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><literal remap="tt">chips</literal></entry>
-                <entry>Chips &amp; Technologies</entry>
-                <entry><ulink url="chips.html">README.chips</ulink>,
-                    <ulink url="chips.4.html">chips(4)</ulink>
-                </entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">cirrus</literal></entry>
                 <entry>Cirrus Logic</entry>
                 <entry>&nbsp;</entry>
@@ -356,24 +344,19 @@ The next section describes what is new in the latest version
             <row>
                 <entry><literal remap="tt">i128</literal></entry>
                 <entry>Number Nine</entry>
-                <entry><ulink url="I128.html">README.I128</ulink>,
+                <entry><ulink url="I128.txt">README.I128</ulink>,
                     <ulink url="i128.4.html">i128(4)</ulink></entry>
             </row>
             <row>
-                <entry><literal remap="tt">i740</literal></entry>
-                <entry>Intel i740</entry>
-                <entry><ulink url="i740.html">README.i740</ulink></entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">intel</literal></entry>
                 <entry>Intel Integrated Graphics Processors</entry>
-                <entry><ulink url="intel.html">README.intel</ulink>,
+                <entry><ulink url="intel.txt">README.intel</ulink>,
                     <ulink url="intel.4.html">intel(4)</ulink></entry>
             </row>
             <row>
                 <entry><literal remap="tt">mach64</literal></entry>
                 <entry>ATI Mach64</entry>
-                <entry><ulink url="ati.html">README.ati</ulink></entry>
+                <entry><ulink url="ati.txt">README.ati</ulink></entry>
             </row>
             <row>
                 <entry><literal remap="tt">mga</literal></entry>
@@ -388,7 +371,7 @@ The next section describes what is new in the latest version
             <row>
                 <entry><literal remap="tt">newport</literal> (-)</entry>
                 <entry>SGI Newport</entry>
-                <entry><ulink url="newport.html">README.newport</ulink>,
+                <entry><ulink url="newport.txt">README.newport</ulink>,
                     <ulink url="newport.4.html">newport(4)</ulink></entry>
             </row>
             <row>
@@ -399,7 +382,7 @@ The next section describes what is new in the latest version
             <row>
                 <entry><literal remap="tt">r128</literal></entry>
                 <entry>ATI Rage128</entry>
-                <entry><ulink url="r128.html">README.r128</ulink>,
+                <entry><ulink url="r128.txt">README.r128</ulink>,
 			<ulink url="r128.4.html">r128(4)</ulink></entry>
             </row>
             <row>
@@ -407,24 +390,6 @@ The next section describes what is new in the latest version
                 <entry>ATI Radeon</entry>
                 <entry><ulink url="radeon.4.html">radeon(4)</ulink></entry>
             </row>
-
-            <row>
-                <entry><literal remap="tt">rendition</literal></entry>
-                <entry>Rendition</entry>
-                <entry><ulink url="rendition.html">README.rendition</ulink>,
-                    <ulink url="rendition.4.html">rendition(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><literal remap="tt">s3</literal></entry>
-                <entry>S3 (not ViRGE or Savage)</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><literal remap="tt">s3virge</literal></entry>
-                <entry>S3 ViRGE</entry>
-                <entry><ulink url="s3virge.html">README.s3virge</ulink>,
-                    <ulink url="s3virge.4.html">s3virge(4)</ulink></entry>
-            </row>
             <row>
                 <entry><literal remap="tt">savage</literal></entry>
                 <entry>S3 Savage</entry>
@@ -438,25 +403,10 @@ The next section describes what is new in the latest version
             <row>
                 <entry><literal remap="tt">sis</literal></entry>
                 <entry>SiS</entry>
-                <entry><ulink url="SiS.html">README.SiS</ulink>,
+                <entry><ulink url="SiS.txt">README.SiS</ulink>,
                     <ulink url="sis.4.html">sis(4)</ulink></entry>
             </row>
             <row>
-                <entry><literal remap="tt">sisusb</literal></entry>
-                <entry>SiS USB</entry>
-                <entry><ulink url="sisusb.4.html">sisusb(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><literal remap="tt">suncg14</literal> (+)</entry>
-                <entry>Sun cg14</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry><literal remap="tt">suncg3</literal> (+)</entry>
-                <entry>Sun cg3</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">suncg6</literal> (+)</entry>
                 <entry>Sun GX and Turbo GX</entry>
                 <entry>&nbsp;</entry>
@@ -467,17 +417,6 @@ The next section describes what is new in the latest version
                 <entry>&nbsp;</entry>
             </row>
             <row>
-                <entry><literal remap="tt">sunleo</literal> (+)</entry>
-                <entry>Sun Leo (ZX)</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
-                <entry>
-                <literal remap="tt">suntcx</literal> (+)</entry>
-                <entry>Sun TCX</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">tdfx</literal></entry>
                 <entry>3Dfx Voodoo Banshee, 3, 4 &amp; 5</entry>
                 <entry><ulink url="tdfx.4.html">tdfx(4)</ulink></entry>
@@ -493,11 +432,6 @@ The next section describes what is new in the latest version
                 <entry><ulink url="trident.4.html">trident(4)</ulink></entry>
             </row>
             <row>
-                <entry><literal remap="tt">tseng</literal></entry>
-                <entry>Tseng Labs</entry>
-                <entry>&nbsp;</entry>
-            </row>
-            <row>
                 <entry><literal remap="tt">v4l</literal></entry>
                 <entry>Video4Linux</entry>
                 <entry><ulink url="v4l.4.html">v4l(4)</ulink></entry>
@@ -522,16 +456,6 @@ The next section describes what is new in the latest version
                 <entry>Workstation Framebuffer</entry>
                 <entry><ulink url="wsfb.4.html">wsfb(4)</ulink></entry>
             </row>
-            <row>
-                <entry><literal remap="tt">xgi</literal></entry>
-                <entry>XGI</entry>
-                <entry><ulink url="xgi.4.html">xgi(4)</ulink></entry>
-            </row>
-            <row>
-                <entry><literal remap="tt">xgixp</literal></entry>
-                <entry>XGI XP</entry>
-                <entry><ulink url="xgixp.4.html">xgixp(4)</ulink></entry>
-            </row>
 	  </tbody>
        </tgroup>
     </informaltable>
@@ -1198,6 +1122,20 @@ The next section describes what is new in the latest version
 		<itemizedlist>
 		  <listitem><para>xf86-input-acecad: Acecad Flair</para></listitem>
 		  <listitem><para>xf86-input-aiptek: Aiptek USB tablet</para></listitem>
+		  <listitem><para>xf86-video-apm: Alliance Pro Motion</para></listitem>
+		  <listitem><para>xf86-video-chips: Chips &amp; Technologies</para></listitem>
+		  <listitem><para>xf86-video-i740: Intel i740</para></listitem>
+		  <listitem><para>xf86-video-rendition: Rendition Verite</para></listitem>
+		  <listitem><para>xf86-video-s3: S3 (not ViRGE or Savage)</para></listitem>
+		  <listitem><para>xf86-video-s3virge: S3 ViRGE</para></listitem>
+		  <listitem><para>xf86-video-sisusb: SiS Net2280-based USB</para></listitem>
+		  <listitem><para>xf86-video-suncg14: Sun CG14</para></listitem>
+		  <listitem><para>xf86-video-suncg3: Sun CG3</para></listitem>
+		  <listitem><para>xf86-video-sunleo: Sun Leo (ZX)</para></listitem>
+		  <listitem><para>xf86-video-suntcx: Sun TCX</para></listitem>
+		  <listitem><para>xf86-video-tseng: Tseng Labs</para></listitem>
+		  <listitem><para>xf86-video-xgi: XGI</para></listitem>
+		  <listitem><para>xf86-video-xgixp: XGI Volari 8300</para></listitem>
 		</itemizedlist>
 	      </para>
 	    </listitem>