68 files changed, 3368 insertions, 933 deletions
diff --git a/Documentation/Changes b/Documentation/Changes
index 783ddc3ce4e8..86b86399d61d 100644
--- a/Documentation/Changes
+++ b/Documentation/Changes
@@ -139,9 +139,14 @@ You'll probably want to upgrade.
 Ksymoops
 --------
-If the unthinkable happens and your kernel oopses, you'll need a 2.4
+If the unthinkable happens and your kernel oopses, you may need the
-version of ksymoops to decode the report; see REPORTING-BUGS in the
+ksymoops tool to decode it, but in most cases you don't.
-root of the Linux source for more information.
+In the 2.6 kernel it is generally preferred to build the kernel with
+CONFIG_KALLSYMS so that it produces readable dumps that can be used as-is
+(this also produces better output than ksymoops).
+If for some reason your kernel is not build with CONFIG_KALLSYMS and
+you have no way to rebuild and reproduce the Oops with that option, then
+you can still decode that Oops with ksymoops.
 Module-Init-Tools
 -----------------
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index fa3e29ad8a46..1c955883cf58 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -10,7 +10,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
            kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
            procfs-guide.xml writing_usb_driver.xml \
            sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \
-            gadget.xml libata.xml mtdnand.xml librs.xml
+            gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml
 ###
 # The build process is as follows (targets):
@@ -20,6 +20,12 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
 #                        +--> DIR=file  (htmldocs)
 #                        +--> man/      (mandocs)
+# for PDF and PS output you can choose between xmlto and docbook-utils tools
+PDF_METHOD      = $(prefer-db2x)
+PS_METHOD       = $(prefer-db2x)
 ###
 # The targets that may be used.
 .PHONY: xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
@@ -93,27 +99,39 @@ C-procfs-example = procfs_example.xml
 C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
 $(obj)/procfs-guide.xml: $(C-procfs-example2)
-###
+notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
-# Rules to generate postscript, PDF and HTML
+                   exit 1
-# db2html creates a directory. Generate a html file used for timestamp
+db2xtemplate = db2TYPE -o $(dir $@) $<
+xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<
+# determine which methods are available
+ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)
+        use-db2x = db2x
+        prefer-db2x = db2x
+else
+        use-db2x = notfound
+        prefer-db2x = $(use-xmlto)
+endif
+ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)
+        use-xmlto = xmlto
+        prefer-xmlto = xmlto
+else
+        use-xmlto = notfound
+        prefer-xmlto = $(use-db2x)
+endif
-quiet_cmd_db2ps = XMLTO    $@
+# the commands, generated from the chosen template
-      cmd_db2ps = xmlto ps $(XMLTOFLAGS) -o $(dir $@) $<
+quiet_cmd_db2ps = PS      $@
+      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))
 %.ps : %.xml
-        @(which xmlto > /dev/null 2>&1) || \
-         (echo "*** You need to install xmlto ***"; \
-          exit 1)
        $(call cmd,db2ps)
-quiet_cmd_db2pdf = XMLTO   $@
+quiet_cmd_db2pdf = PDF      $@
-      cmd_db2pdf = xmlto pdf $(XMLTOFLAGS) -o $(dir $@) $<
+      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))
 %.pdf : %.xml
-        @(which xmlto > /dev/null 2>&1) || \
-         (echo "*** You need to install xmlto ***"; \
-          exit 1)
        $(call cmd,db2pdf)
-quiet_cmd_db2html = XMLTO  $@
+quiet_cmd_db2html = HTML   $@
      cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
                echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
         Goto $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
@@ -127,7 +145,7 @@ quiet_cmd_db2html = XMLTO  $@
        @if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \
            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
-quiet_cmd_db2man = XMLTO   $@
+quiet_cmd_db2man = MAN     $@
      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi
 %.9 : %.xml
        @(which xmlto > /dev/null 2>&1) || \
diff --git a/Documentation/DocBook/journal-api.tmpl b/Documentation/DocBook/journal-api.tmpl
index 341aaa4ce481..2077f9a28c19 100644
--- a/Documentation/DocBook/journal-api.tmpl
+++ b/Documentation/DocBook/journal-api.tmpl
@@ -306,7 +306,7 @@ an example.
 </para>
        <sect1><title>Journal Level</title>
 !Efs/jbd/journal.c
-!Efs/jbd/recovery.c
+!Ifs/jbd/recovery.c
        </sect1>
        <sect1><title>Transasction Level</title>
 !Efs/jbd/transaction.c  
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index ec474e5a25ed..0519c9dc0065 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -68,9 +68,7 @@ X!Iinclude/linux/kobject.h
     <sect1><title>Kernel utility functions</title>
 !Iinclude/linux/kernel.h
-<!-- This needs to clean up to make kernel-doc happy
+!Ekernel/printk.c
-X!Ekernel/printk.c
- -->
 !Ekernel/panic.c
 !Ekernel/sys.c
 !Ekernel/rcupdate.c
@@ -118,7 +116,7 @@ X!Ilib/string.c
     </sect1>
     <sect1><title>User Space Memory Access</title>
 !Iinclude/asm-i386/uaccess.h
-!Iarch/i386/lib/usercopy.c
+!Earch/i386/lib/usercopy.c
     </sect1>
     <sect1><title>More Memory Management Functions</title>
 !Iinclude/linux/rmap.h
@@ -174,7 +172,6 @@ X!Ilib/string.c
     <title>The Linux VFS</title>
     <sect1><title>The Filesystem types</title>
 !Iinclude/linux/fs.h
-!Einclude/linux/fs.h
     </sect1>
     <sect1><title>The Directory Cache</title>
 !Efs/dcache.c
@@ -266,7 +263,7 @@ X!Ekernel/module.c
  <chapter id="hardware">
     <title>Hardware Interfaces</title>
     <sect1><title>Interrupt Handling</title>
-!Ikernel/irq/manage.c
+!Ekernel/irq/manage.c
     </sect1>
     <sect1><title>Resources Management</title>
@@ -501,7 +498,7 @@ KAO -->
 !Edrivers/video/modedb.c
     </sect1>
     <sect1><title>Frame Buffer Macintosh Video Mode Database</title>
-!Idrivers/video/macmodes.c
+!Edrivers/video/macmodes.c
     </sect1>
     <sect1><title>Frame Buffer Fonts</title>
        <para>
diff --git a/Documentation/DocBook/rapidio.tmpl b/Documentation/DocBook/rapidio.tmpl
new file mode 100644
index 000000000000..1becf27ba27e
--- /dev/null
+++ b/Documentation/DocBook/rapidio.tmpl
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+        "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+        <!ENTITY rapidio SYSTEM "rapidio.xml">
+        ]>
+<book id="RapidIO-Guide">
+ <bookinfo>
+  <title>RapidIO Subsystem Guide</title>
+  <authorgroup>
+   <author>
+    <firstname>Matt</firstname>
+    <surname>Porter</surname>
+    <affiliation>
+     <address>
+      <email>mporter@kernel.crashing.org</email>
+      <email>mporter@mvista.com</email>
+     </address>
+    </affiliation>
+   </author>
+  </authorgroup>
+  <copyright>
+   <year>2005</year>
+   <holder>MontaVista Software, Inc.</holder>
+  </copyright>
+  <legalnotice>
+   <para>
+     This documentation is free software; you can redistribute
+     it and/or modify it under the terms of the GNU General Public
+     License version 2 as published by the Free Software Foundation.
+   </para>
+   <para>
+     This program is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+     See the GNU General Public License for more details.
+   </para>
+   <para>
+     You should have received a copy of the GNU General Public
+     License along with this program; if not, write to the Free
+     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+     MA 02111-1307 USA
+   </para>
+   <para>
+     For more details see the file COPYING in the source
+     distribution of Linux.
+   </para>
+  </legalnotice>
+ </bookinfo>
+<toc></toc>
+  <chapter id="intro">
+      <title>Introduction</title>
+  <para>
+        RapidIO is a high speed switched fabric interconnect with
+        features aimed at the embedded market.  RapidIO provides
+        support for memory-mapped I/O as well as message-based
+        transactions over the switched fabric network. RapidIO has
+        a standardized discovery mechanism not unlike the PCI bus
+        standard that allows simple detection of devices in a
+        network.
+  </para>
+  <para>
+        This documentation is provided for developers intending
+        to support RapidIO on new architectures, write new drivers,
+        or to understand the subsystem internals.
+  </para>
+  </chapter>
+  <chapter id="bugs">
+     <title>Known Bugs and Limitations</title>
+     <sect1>
+        <title>Bugs</title>
+          <para>None. ;)</para>
+     </sect1>
+     <sect1>
+        <title>Limitations</title>
+          <para>
+            <orderedlist>
+              <listitem><para>Access/management of RapidIO memory regions is not supported</para></listitem>
+              <listitem><para>Multiple host enumeration is not supported</para></listitem>
+            </orderedlist>
+         </para>
+     </sect1>
+  </chapter>
+  <chapter id="drivers">
+        <title>RapidIO driver interface</title>
+        <para>
+                Drivers are provided a set of calls in order
+                to interface with the subsystem to gather info
+                on devices, request/map memory region resources,
+                and manage mailboxes/doorbells.
+        </para>
+        <sect1>
+                <title>Functions</title>
+!Iinclude/linux/rio_drv.h
+!Edrivers/rapidio/rio-driver.c
+!Edrivers/rapidio/rio.c
+        </sect1>
+  </chapter>
+  <chapter id="internals">
+     <title>Internals</title>
+     <para>
+     This chapter contains the autogenerated documentation of the RapidIO
+     subsystem.
+     </para>
+     <sect1><title>Structures</title>
+!Iinclude/linux/rio.h
+     </sect1>
+     <sect1><title>Enumeration and Discovery</title>
+!Idrivers/rapidio/rio-scan.c
+     </sect1>
+     <sect1><title>Driver functionality</title>
+!Idrivers/rapidio/rio.c
+!Idrivers/rapidio/rio-access.c
+     </sect1>
+     <sect1><title>Device model support</title>
+!Idrivers/rapidio/rio-driver.c
+     </sect1>
+     <sect1><title>Sysfs support</title>
+!Idrivers/rapidio/rio-sysfs.c
+     </sect1>
+     <sect1><title>PPC32 support</title>
+!Iarch/ppc/kernel/rio.c
+!Earch/ppc/syslib/ppc85xx_rio.c
+!Iarch/ppc/syslib/ppc85xx_rio.c
+     </sect1>
+  </chapter>
+  <chapter id="credits">
+     <title>Credits</title>
+        <para>
+                The following people have contributed to the RapidIO
+                subsystem directly or indirectly:
+                <orderedlist>
+                        <listitem><para>Matt Porter<email>mporter@kernel.crashing.org</email></para></listitem>
+                        <listitem><para>Randy Vinson<email>rvinson@mvista.com</email></para></listitem>
+                        <listitem><para>Dan Malek<email>dan@embeddedalley.com</email></para></listitem>
+                </orderedlist>
+        </para>
+        <para>
+                The following people have contributed to this document:
+                <orderedlist>
+                        <listitem><para>Matt Porter<email>mporter@kernel.crashing.org</email></para></listitem>
+                </orderedlist>
+        </para>
+  </chapter>
+</book>
diff --git a/Documentation/DocBook/stylesheet.xsl b/Documentation/DocBook/stylesheet.xsl
index 64be9f7ee3bb..3ccce886c349 100644
--- a/Documentation/DocBook/stylesheet.xsl
+++ b/Documentation/DocBook/stylesheet.xsl
@@ -3,4 +3,5 @@
 <param name="chunk.quietly">1</param>
 <param name="funcsynopsis.style">ansi</param>
 <param name="funcsynopsis.tabular.threshold">80</param>
+<!-- <param name="paper.type">A4</param> -->
 </stylesheet>
diff --git a/Documentation/MSI-HOWTO.txt b/Documentation/MSI-HOWTO.txt
index 63edc5f847c4..3ec6c720b016 100644
--- a/Documentation/MSI-HOWTO.txt
+++ b/Documentation/MSI-HOWTO.txt
@@ -10,14 +10,22 @@
 This guide describes the basics of Message Signaled Interrupts (MSI),
 the advantages of using MSI over traditional interrupt mechanisms,
 and how to enable your driver to use MSI or MSI-X. Also included is
-a Frequently Asked Questions.
+a Frequently Asked Questions (FAQ) section.
+1.1 Terminology
+PCI devices can be single-function or multi-function.  In either case,
+when this text talks about enabling or disabling MSI on a "device
+function," it is referring to one specific PCI device and function and
+not to all functions on a PCI device (unless the PCI device has only
+one function).
 2. Copyright 2003 Intel Corporation
 3. What is MSI/MSI-X?
 Message Signaled Interrupt (MSI), as described in the PCI Local Bus
-Specification Revision 2.3 or latest, is an optional feature, and a
+Specification Revision 2.3 or later, is an optional feature, and a
 required feature for PCI Express devices. MSI enables a device function
 to request service by sending an Inbound Memory Write on its PCI bus to
 the FSB as a Message Signal Interrupt transaction. Because MSI is
@@ -27,7 +35,7 @@ supported.
 A PCI device that supports MSI must also support pin IRQ assertion
 interrupt mechanism to provide backward compatibility for systems that
-do not support MSI. In Systems, which support MSI, the bus driver is
+do not support MSI. In systems which support MSI, the bus driver is
 responsible for initializing the message address and message data of
 the device function's MSI/MSI-X capability structure during device
 initial configuration.
@@ -61,17 +69,17 @@ over the MSI capability structure as described below.
        - MSI and MSI-X both support per-vector masking. Per-vector
        masking is an optional extension of MSI but a required
-        feature for MSI-X. Per-vector masking provides the kernel
+        feature for MSI-X. Per-vector masking provides the kernel the
-        the ability to mask/unmask MSI when servicing its software
+        ability to mask/unmask a single MSI while running its
-        interrupt service routing handler. If per-vector masking is
+        interrupt service routine. If per-vector masking is
        not supported, then the device driver should provide the
        hardware/software synchronization to ensure that the device
        generates MSI when the driver wants it to do so.
 4. Why use MSI?
-As a benefit the simplification of board design, MSI allows board
+As a benefit to the simplification of board design, MSI allows board
-designers to remove out of band interrupt routing. MSI is another
+designers to remove out-of-band interrupt routing. MSI is another
 step towards a legacy-free environment.
 Due to increasing pressure on chipset and processor packages to
@@ -87,7 +95,7 @@ support. As a result, the PCI Express technology requires MSI
 support for better interrupt performance.
 Using MSI enables the device functions to support two or more
-vectors, which can be configured to target different CPU's to
+vectors, which can be configured to target different CPUs to
 increase scalability.
 5. Configuring a driver to use MSI/MSI-X
@@ -119,13 +127,13 @@ pci_enable_msi() explicitly.
 int pci_enable_msi(struct pci_dev *dev)
-With this new API, any existing device driver, which like to have
+With this new API, a device driver that wants to have MSI
-MSI enabled on its device function, must call this API to enable MSI
+enabled on its device function must call this API to enable MSI.
 A successful call will initialize the MSI capability structure
 with ONE vector, regardless of whether a device function is
 capable of supporting multiple messages. This vector replaces the
-pre-assigned dev->irq with a new MSI vector. To avoid the conflict
+pre-assigned dev->irq with a new MSI vector. To avoid a conflict
-of new assigned vector with existing pre-assigned vector requires
+of the new assigned vector with existing pre-assigned vector requires
 a device driver to call this API before calling request_irq().
 5.2.2 API pci_disable_msi
@@ -137,14 +145,14 @@ when a device driver is unloading. This API restores dev->irq with
 the pre-assigned IOAPIC vector and switches a device's interrupt
 mode to PCI pin-irq assertion/INTx emulation mode.
-Note that a device driver should always call free_irq() on MSI vector
+Note that a device driver should always call free_irq() on the MSI vector
-it has done request_irq() on before calling this API. Failure to do
+that it has done request_irq() on before calling this API. Failure to do
-so results a BUG_ON() and a device will be left with MSI enabled and
+so results in a BUG_ON() and a device will be left with MSI enabled and
 leaks its vector.
 5.2.3 MSI mode vs. legacy mode diagram
-The below diagram shows the events, which switches the interrupt
+The below diagram shows the events which switch the interrupt
 mode on the MSI-capable device function between MSI mode and
 PIN-IRQ assertion mode.
@@ -155,9 +163,9 @@ PIN-IRQ assertion mode.
         ------------   pci_disable_msi  ------------------------
-Figure 1.0 MSI Mode vs. Legacy Mode
+Figure 1. MSI Mode vs. Legacy Mode
-In Figure 1.0, a device operates by default in legacy mode. Legacy
+In Figure 1, a device operates by default in legacy mode. Legacy
 in this context means PCI pin-irq assertion or PCI-Express INTx
 emulation. A successful MSI request (using pci_enable_msi()) switches
 a device's interrupt mode to MSI mode. A pre-assigned IOAPIC vector
@@ -166,11 +174,11 @@ assigned MSI vector will replace dev->irq.
 To return back to its default mode, a device driver should always call
 pci_disable_msi() to undo the effect of pci_enable_msi(). Note that a
-device driver should always call free_irq() on MSI vector it has done
+device driver should always call free_irq() on the MSI vector it has
-request_irq() on before calling pci_disable_msi(). Failure to do so
+done request_irq() on before calling pci_disable_msi(). Failure to do
-results a BUG_ON() and a device will be left with MSI enabled and
+so results in a BUG_ON() and a device will be left with MSI enabled and
 leaks its vector. Otherwise, the PCI subsystem restores a device's
-dev->irq with a pre-assigned IOAPIC vector and marks released
+dev->irq with a pre-assigned IOAPIC vector and marks the released
 MSI vector as unused.
 Once being marked as unused, there is no guarantee that the PCI
@@ -178,8 +186,8 @@ subsystem will reserve this MSI vector for a device. Depending on
 the availability of current PCI vector resources and the number of
 MSI/MSI-X requests from other drivers, this MSI may be re-assigned.
-For the case where the PCI subsystem re-assigned this MSI vector
+For the case where the PCI subsystem re-assigns this MSI vector to
-another driver, a request to switching back to MSI mode may result
+another driver, a request to switch back to MSI mode may result
 in being assigned a different MSI vector or a failure if no more
 vectors are available.
@@ -208,12 +216,12 @@ Unlike the function pci_enable_msi(), the function pci_enable_msix()
 does not replace the pre-assigned IOAPIC dev->irq with a new MSI
 vector because the PCI subsystem writes the 1:1 vector-to-entry mapping
 into the field vector of each element contained in a second argument.
-Note that the pre-assigned IO-APIC dev->irq is valid only if the device
+Note that the pre-assigned IOAPIC dev->irq is valid only if the device
-operates in PIN-IRQ assertion mode. In MSI-X mode, any attempt of
+operates in PIN-IRQ assertion mode. In MSI-X mode, any attempt at
 using dev->irq by the device driver to request for interrupt service
 may result unpredictabe behavior.
-For each MSI-X vector granted, a device driver is responsible to call
+For each MSI-X vector granted, a device driver is responsible for calling
 other functions like request_irq(), enable_irq(), etc. to enable
 this vector with its corresponding interrupt service handler. It is
 a device driver's choice to assign all vectors with the same
@@ -224,13 +232,13 @@ service handler.
 The PCI 3.0 specification has implementation notes that MMIO address
 space for a device's MSI-X structure should be isolated so that the
-software system can set different page for controlling accesses to
+software system can set different pages for controlling accesses to the
-the MSI-X structure. The implementation of MSI patch requires the PCI
+MSI-X structure. The implementation of MSI support requires the PCI
 subsystem, not a device driver, to maintain full control of the MSI-X
-table/MSI-X PBA and MMIO address space of the MSI-X table/MSI-X PBA.
+table/MSI-X PBA (Pending Bit Array) and MMIO address space of the MSI-X
-A device driver is prohibited from requesting the MMIO address space
+table/MSI-X PBA.  A device driver is prohibited from requesting the MMIO
-of the MSI-X table/MSI-X PBA. Otherwise, the PCI subsystem will fail
+address space of the MSI-X table/MSI-X PBA. Otherwise, the PCI subsystem
-enabling MSI-X on its hardware device when it calls the function
+will fail enabling MSI-X on its hardware device when it calls the function
 pci_enable_msix().
 5.3.2 Handling MSI-X allocation
@@ -274,9 +282,9 @@ For the case where fewer MSI-X vectors are allocated to a function
 than requested, the function pci_enable_msix() will return the
 maximum number of MSI-X vectors available to the caller. A device
 driver may re-send its request with fewer or equal vectors indicated
-in a return. For example, if a device driver requests 5 vectors, but
+in the return. For example, if a device driver requests 5 vectors, but
-the number of available vectors is 3 vectors, a value of 3 will be a
+the number of available vectors is 3 vectors, a value of 3 will be
-return as a result of pci_enable_msix() call. A function could be
+returned as a result of pci_enable_msix() call. A function could be
 designed for its driver to use only 3 MSI-X table entries as
 different combinations as ABC--, A-B-C, A--CB, etc. Note that this
 patch does not support multiple entries with the same vector. Such
@@ -285,49 +293,46 @@ as ABBCC, AABCC, BCCBA, etc will result as a failure by the function
 pci_enable_msix(). Below are the reasons why supporting multiple
 entries with the same vector is an undesirable solution.
-        - The PCI subsystem can not determine which entry, which
+        - The PCI subsystem cannot determine the entry that
-          generated the message, to mask/unmask MSI while handling
+          generated the message to mask/unmask MSI while handling
          software driver ISR. Attempting to walk through all MSI-X
          table entries (2048 max) to mask/unmask any match vector
          is an undesirable solution.
-        - Walk through all MSI-X table entries (2048 max) to handle
+        - Walking through all MSI-X table entries (2048 max) to handle
          SMP affinity of any match vector is an undesirable solution.
 5.3.4 API pci_enable_msix
-int pci_enable_msix(struct pci_dev *dev, u32 *entries, int nvec)
+int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
 This API enables a device driver to request the PCI subsystem
-for enabling MSI-X messages on its hardware device. Depending on
+to enable MSI-X messages on its hardware device. Depending on
 the availability of PCI vectors resources, the PCI subsystem enables
-either all or nothing.
+either all or none of the requested vectors.
-Argument dev points to the device (pci_dev) structure.
+Argument 'dev' points to the device (pci_dev) structure.
-Argument entries is a pointer of unsigned integer type. The number of
+Argument 'entries' is a pointer to an array of msix_entry structs.
-elements is indicated in argument nvec. The content of each element
+The number of entries is indicated in argument 'nvec'.
-will be mapped to the following struct defined in /driver/pci/msi.h.
+struct msix_entry is defined in /driver/pci/msi.h:
 struct msix_entry {
        u16     vector; /* kernel uses to write alloc vector */
        u16     entry; /* driver uses to specify entry */
 };
-A device driver is responsible for initializing the field entry of
+A device driver is responsible for initializing the field 'entry' of
-each element with unique entry supported by MSI-X table. Otherwise,
+each element with a unique entry supported by MSI-X table. Otherwise,
 -EINVAL will be returned as a result. A successful return of zero
-indicates the PCI subsystem completes initializing each of requested
+indicates the PCI subsystem completed initializing each of the requested
 entries of the MSI-X table with message address and message data.
 Last but not least, the PCI subsystem will write the 1:1
-vector-to-entry mapping into the field vector of each element. A
+vector-to-entry mapping into the field 'vector' of each element. A
-device driver is responsible of keeping track of allocated MSI-X
+device driver is responsible for keeping track of allocated MSI-X
 vectors in its internal data structure.
-Argument nvec is an integer indicating the number of messages
+A return of zero indicates that the number of MSI-X vectors was
-requested.
-A return of zero indicates that the number of MSI-X vectors is
 successfully allocated. A return of greater than zero indicates
 MSI-X vector shortage. Or a return of less than zero indicates
 a failure. This failure may be a result of duplicate entries
@@ -341,12 +346,12 @@ void pci_disable_msix(struct pci_dev *dev)
 This API should always be used to undo the effect of pci_enable_msix()
 when a device driver is unloading. Note that a device driver should
 always call free_irq() on all MSI-X vectors it has done request_irq()
-on before calling this API. Failure to do so results a BUG_ON() and
+on before calling this API. Failure to do so results in a BUG_ON() and
 a device will be left with MSI-X enabled and leaks its vectors.
 5.3.6 MSI-X mode vs. legacy mode diagram
-The below diagram shows the events, which switches the interrupt
+The below diagram shows the events which switch the interrupt
 mode on the MSI-X capable device function between MSI-X mode and
 PIN-IRQ assertion mode (legacy).
@@ -356,22 +361,22 @@ PIN-IRQ assertion mode (legacy).
        |            | ===============>     |                        |
         ------------   pci_disable_msix     ------------------------
-Figure 2.0 MSI-X Mode vs. Legacy Mode
+Figure 2. MSI-X Mode vs. Legacy Mode
-In Figure 2.0, a device operates by default in legacy mode. A
+In Figure 2, a device operates by default in legacy mode. A
 successful MSI-X request (using pci_enable_msix()) switches a
 device's interrupt mode to MSI-X mode. A pre-assigned IOAPIC vector
 stored in dev->irq will be saved by the PCI subsystem; however,
 unlike MSI mode, the PCI subsystem will not replace dev->irq with
 assigned MSI-X vector because the PCI subsystem already writes the 1:1
-vector-to-entry mapping into the field vector of each element
+vector-to-entry mapping into the field 'vector' of each element
 specified in second argument.
 To return back to its default mode, a device driver should always call
 pci_disable_msix() to undo the effect of pci_enable_msix(). Note that
 a device driver should always call free_irq() on all MSI-X vectors it
 has done request_irq() on before calling pci_disable_msix(). Failure
-to do so results a BUG_ON() and a device will be left with MSI-X
+to do so results in a BUG_ON() and a device will be left with MSI-X
 enabled and leaks its vectors. Otherwise, the PCI subsystem switches a
 device function's interrupt mode from MSI-X mode to legacy mode and
 marks all allocated MSI-X vectors as unused.
@@ -383,53 +388,56 @@ MSI/MSI-X requests from other drivers, these MSI-X vectors may be
 re-assigned.
 For the case where the PCI subsystem re-assigned these MSI-X vectors
-to other driver, a request to switching back to MSI-X mode may result
+to other drivers, a request to switch back to MSI-X mode may result
 being assigned with another set of MSI-X vectors or a failure if no
 more vectors are available.
-5.4 Handling function implementng both MSI and MSI-X capabilities
+5.4 Handling function implementing both MSI and MSI-X capabilities
 For the case where a function implements both MSI and MSI-X
 capabilities, the PCI subsystem enables a device to run either in MSI
 mode or MSI-X mode but not both. A device driver determines whether it
 wants MSI or MSI-X enabled on its hardware device. Once a device
-driver requests for MSI, for example, it is prohibited to request for
+driver requests for MSI, for example, it is prohibited from requesting
 MSI-X; in other words, a device driver is not permitted to ping-pong
 between MSI mod MSI-X mode during a run-time.
 5.5 Hardware requirements for MSI/MSI-X support
 MSI/MSI-X support requires support from both system hardware and
 individual hardware device functions.
 5.5.1 System hardware support
 Since the target of MSI address is the local APIC CPU, enabling
-MSI/MSI-X support in Linux kernel is dependent on whether existing
+MSI/MSI-X support in the Linux kernel is dependent on whether existing
-system hardware supports local APIC. Users should verify their
+system hardware supports local APIC. Users should verify that their
-system whether it runs when CONFIG_X86_LOCAL_APIC=y.
+system supports local APIC operation by testing that it runs when
+CONFIG_X86_LOCAL_APIC=y.
 In SMP environment, CONFIG_X86_LOCAL_APIC is automatically set;
 however, in UP environment, users must manually set
 CONFIG_X86_LOCAL_APIC. Once CONFIG_X86_LOCAL_APIC=y, setting
-CONFIG_PCI_MSI enables the VECTOR based scheme and
+CONFIG_PCI_MSI enables the VECTOR based scheme and the option for
-the option for MSI-capable device drivers to selectively enable
+MSI-capable device drivers to selectively enable MSI/MSI-X.
-MSI/MSI-X.
 Note that CONFIG_X86_IO_APIC setting is irrelevant because MSI/MSI-X
 vector is allocated new during runtime and MSI/MSI-X support does not
 depend on BIOS support. This key independency enables MSI/MSI-X
-support on future IOxAPIC free platform.
+support on future IOxAPIC free platforms.
 5.5.2 Device hardware support
 The hardware device function supports MSI by indicating the
 MSI/MSI-X capability structure on its PCI capability list. By
 default, this capability structure will not be initialized by
 the kernel to enable MSI during the system boot. In other words,
 the device function is running on its default pin assertion mode.
 Note that in many cases the hardware supporting MSI have bugs,
-which may result in system hang. The software driver of specific
+which may result in system hangs. The software driver of specific
-MSI-capable hardware is responsible for whether calling
+MSI-capable hardware is responsible for deciding whether to call
 pci_enable_msi or not. A return of zero indicates the kernel
-successfully initializes the MSI/MSI-X capability structure of the
+successfully initialized the MSI/MSI-X capability structure of the
 device function. The device function is now running on MSI/MSI-X mode.
 5.6 How to tell whether MSI/MSI-X is enabled on device function
@@ -439,10 +447,10 @@ pci_enable_msi()/pci_enable_msix() indicates to a device driver that
 its device function is initialized successfully and ready to run in
 MSI/MSI-X mode.
-At the user level, users can use command 'cat /proc/interrupts'
+At the user level, users can use the command 'cat /proc/interrupts'
-to display the vector allocated for a device and its interrupt
+to display the vectors allocated for devices and their interrupt
-MSI/MSI-X mode ("PCI MSI"/"PCI MSIX"). Below shows below MSI mode is
+MSI/MSI-X modes ("PCI-MSI"/"PCI-MSI-X"). Below shows MSI mode is
-enabled on a SCSI Adaptec 39320D Ultra320.
+enabled on a SCSI Adaptec 39320D Ultra320 controller.
           CPU0       CPU1
  0:     324639          0    IO-APIC-edge  timer
@@ -453,8 +461,8 @@ enabled on a SCSI Adaptec 39320D Ultra320.
 15:          1          0    IO-APIC-edge  ide1
 169:          0          0   IO-APIC-level  uhci-hcd
 185:          0          0   IO-APIC-level  uhci-hcd
-193:        138         10         PCI MSI  aic79xx
+193:        138         10         PCI-MSI  aic79xx
-201:         30          0         PCI MSI  aic79xx
+201:         30          0         PCI-MSI  aic79xx
 225:         30          0   IO-APIC-level  aic7xxx
 233:         30          0   IO-APIC-level  aic7xxx
 NMI:          0          0
@@ -490,8 +498,8 @@ target address set as 0xfeexxxxx, as conformed to PCI
 specification 2.3 or latest, then it should work.
 Q4. From the driver point of view, if the MSI is lost because
-of the errors occur during inbound memory write, then it may
+of errors occurring during inbound memory write, then it may
-wait for ever. Is there a mechanism for it to recover?
+wait forever. Is there a mechanism for it to recover?
 A4. Since the target of the transaction is an inbound memory
 write, all transaction termination conditions (Retry,
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt
index 354d89c78377..15da16861fa3 100644
--- a/Documentation/RCU/whatisRCU.txt
+++ b/Documentation/RCU/whatisRCU.txt
@@ -772,8 +772,6 @@ RCU pointer/list traversal:
        list_for_each_entry_rcu
        list_for_each_continue_rcu      (to be deprecated in favor of new
                                         list_for_each_entry_continue_rcu)
-        hlist_for_each_rcu              (to be deprecated in favor of
-                                         hlist_for_each_entry_rcu)
        hlist_for_each_entry_rcu
 RCU pointer update:
diff --git a/Documentation/arm/README b/Documentation/arm/README
index a6f718e90a86..5ed6f3530b86 100644
--- a/Documentation/arm/README
+++ b/Documentation/arm/README
@@ -8,10 +8,9 @@ Compilation of kernel
 ---------------------
  In order to compile ARM Linux, you will need a compiler capable of
-  generating ARM ELF code with GNU extensions.  GCC 2.95.1, EGCS
+  generating ARM ELF code with GNU extensions.  GCC 3.3 is known to be
-  1.1.2, and GCC 3.3 are known to be good compilers.  Fortunately, you
+  a good compiler.  Fortunately, you needn't guess.  The kernel will report
-  needn't guess.  The kernel will report an error if your compiler is
+  an error if your compiler is a recognized offender.
-  a recognized offender.
  To build ARM Linux natively, you shouldn't have to alter the ARCH = line
  in the top level Makefile.  However, if you don't have the ARM Linux ELF
diff --git a/Documentation/atomic_ops.txt b/Documentation/atomic_ops.txt
index 8eedaa24f5e2..23a1c2402bcc 100644
--- a/Documentation/atomic_ops.txt
+++ b/Documentation/atomic_ops.txt
@@ -115,6 +115,33 @@ boolean is return which indicates whether the resulting counter value
 is negative.  It requires explicit memory barrier semantics around the
 operation.
+Then:
+        int atomic_cmpxchg(atomic_t *v, int old, int new);
+This performs an atomic compare exchange operation on the atomic value v,
+with the given old and new values. Like all atomic_xxx operations,
+atomic_cmpxchg will only satisfy its atomicity semantics as long as all
+other accesses of *v are performed through atomic_xxx operations.
+atomic_cmpxchg requires explicit memory barriers around the operation.
+The semantics for atomic_cmpxchg are the same as those defined for 'cas'
+below.
+Finally:
+        int atomic_add_unless(atomic_t *v, int a, int u);
+If the atomic value v is not equal to u, this function adds a to v, and
+returns non zero. If v is equal to u then it returns zero. This is done as
+an atomic operation.
+atomic_add_unless requires explicit memory barriers around the operation.
+atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0)
 If a caller requires memory barrier semantics around an atomic_t
 operation which does not return a value, a set of interfaces are
 defined which accomplish this:
diff --git a/Documentation/cciss.txt b/Documentation/cciss.txt
index 68a711fb82cf..15378422fc46 100644
--- a/Documentation/cciss.txt
+++ b/Documentation/cciss.txt
@@ -133,3 +133,32 @@ hardware and it is important to prevent the kernel from attempting to directly
 access these devices too, as if the array controller were merely a SCSI 
 controller in the same way that we are allowing it to access SCSI tape drives.
+SCSI error handling for tape drives and medium changers
+-------------------------------------------------------
+The linux SCSI mid layer provides an error handling protocol which
+kicks into gear whenever a SCSI command fails to complete within a
+certain amount of time (which can vary depending on the command).
+The cciss driver participates in this protocol to some extent.  The
+normal protocol is a four step process.  First the device is told
+to abort the command.  If that doesn't work, the device is reset.
+If that doesn't work, the SCSI bus is reset.  If that doesn't work
+the host bus adapter is reset.  Because the cciss driver is a block
+driver as well as a SCSI driver and only the tape drives and medium
+changers are presented to the SCSI mid layer, and unlike more 
+straightforward SCSI drivers, disk i/o continues through the block
+side during the SCSI error recovery process, the cciss driver only
+implements the first two of these actions, aborting the command, and
+resetting the device.  Additionally, most tape drives will not oblige 
+in aborting commands, and sometimes it appears they will not even 
+obey a reset coommand, though in most circumstances they will.  In
+the case that the command cannot be aborted and the device cannot be 
+reset, the device will be set offline.
+In the event the error handling code is triggered and a tape drive is
+successfully reset or the tardy command is successfully aborted, the 
+tape drive may still not allow i/o to continue until some command
+is issued which positions the tape to a known position.  Typically you
+must rewind the tape (by issuing "mt -f /dev/st0 rewind" for example)
+before i/o can proceed again to a tape drive which was reset.
diff --git a/Documentation/connector/cn_test.c b/Documentation/connector/cn_test.c
index b7de82e9c0e0..3e73231695b3 100644
--- a/Documentation/connector/cn_test.c
+++ b/Documentation/connector/cn_test.c
@@ -25,7 +25,7 @@
 #include <linux/skbuff.h>
 #include <linux/timer.h>
-#include "connector.h"
+#include <linux/connector.h>
 static struct cb_id cn_test_id = { 0x123, 0x456 };
 static char cn_test_name[] = "cn_test";
@@ -104,7 +104,7 @@ static int cn_test_want_notify(void)
        req->first = cn_test_id.val + 20;
        req->range = 10;
-        NETLINK_CB(skb).dst_groups = ctl->group;
+        NETLINK_CB(skb).dst_group = ctl->group;
        //netlink_broadcast(nls, skb, 0, ctl->group, GFP_ATOMIC);
        netlink_unicast(nls, skb, 0, 0);
diff --git a/Documentation/device-mapper/snapshot.txt b/Documentation/device-mapper/snapshot.txt
index dca274ff4005..a5009c8300f3 100644
--- a/Documentation/device-mapper/snapshot.txt
+++ b/Documentation/device-mapper/snapshot.txt
@@ -19,7 +19,6 @@ There are two dm targets available: snapshot and snapshot-origin.
 *) snapshot-origin <origin>
 which will normally have one or more snapshots based on it.
-You must create the snapshot-origin device before you can create snapshots.
 Reads will be mapped directly to the backing device. For each write, the
 original data will be saved in the <COW device> of each snapshot to keep
 its visible content unchanged, at least until the <COW device> fills up.
@@ -27,7 +26,7 @@ its visible content unchanged, at least until the <COW device> fills up.
 *) snapshot <origin> <COW device> <persistent?> <chunksize>
-A snapshot is created of the <origin> block device. Changed chunks of
+A snapshot of the <origin> block device is created. Changed chunks of
 <chunksize> sectors will be stored on the <COW device>.  Writes will
 only go to the <COW device>.  Reads will come from the <COW device> or
 from <origin> for unchanged data.  <COW device> will often be
@@ -37,6 +36,8 @@ the amount of free space and expand the <COW device> before it fills up.
 <persistent?> is P (Persistent) or N (Not persistent - will not survive
 after reboot).
+The difference is that for transient snapshots less metadata must be
+saved on disk - they can be kept in memory by the kernel.
 How this is used by LVM2
diff --git a/Documentation/dvb/bt8xx.txt b/Documentation/dvb/bt8xx.txt
index cb63b7a93c82..df6c05453cb5 100644
--- a/Documentation/dvb/bt8xx.txt
+++ b/Documentation/dvb/bt8xx.txt
@@ -1,5 +1,5 @@
-How to get the Nebula, PCTV and Twinhan DST cards working
+How to get the Nebula, PCTV, FusionHDTV Lite and Twinhan DST cards working
-=========================================================
+==========================================================================
 This class of cards has a bt878a as the PCI interface, and
 require the bttv driver.
@@ -26,27 +26,31 @@ Furthermore you need to enable
 In general you need to load the bttv driver, which will handle the gpio and
 i2c communication for us, plus the common dvb-bt8xx device driver.
-The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110) and
+The frontends for Nebula (nxt6000), Pinnacle PCTV (cx24110), TwinHan (dst),
-TwinHan (dst) are loaded automatically by the dvb-bt8xx device driver.
+FusionHDTV DVB-T Lite (mt352) and FusionHDTV5 Lite (lgdt330x) are loaded
+automatically by the dvb-bt8xx device driver.
-3a) Nebula / Pinnacle PCTV
+3a) Nebula / Pinnacle PCTV / FusionHDTV Lite
--------------------------
+---------------------------------------------
   $ modprobe bttv (normally bttv is being loaded automatically by kmod)
-   $ modprobe dvb-bt8xx (or just place dvb-bt8xx in /etc/modules for automatic loading)
+   $ modprobe dvb-bt8xx
+(or just place dvb-bt8xx in /etc/modules for automatic loading)
 3b) TwinHan and Clones
 --------------------------
-   $ modprobe bttv i2c_hw=1 card=0x71
+   $ modprobe bttv card=0x71
   $ modprobe dvb-bt8xx
   $ modprobe dst
 The value 0x71 will override the PCI type detection for dvb-bt8xx,
-which  is necessary for TwinHan cards.
+which  is necessary for TwinHan cards. Omission of this parameter might result
+in a system lockup.
-If you're having an older card (blue color circuit) and card=0x71 locks
+If you're having an older card (blue color PCB) and card=0x71 locks up
 your machine, try using 0x68, too. If that does not work, ask on the
 mailing list.
@@ -64,11 +68,47 @@ verbose=0 means complete disabling of messages
 dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card.
 0x20 means it has a Conditional Access slot.
-The autodected values are determined bythe cards 'response
+The autodetected values are determined by the cards 'response string'
-string' which you can see in your logs e.g.
+which you can see in your logs e.g.
 dst_get_device_id: Recognise [DSTMCI]
+If you need to sent in bug reports on the dst, please do send in a complete
+log with the verbose=4 module parameter. For general usage, the default setting
+of verbose=1 is ideal.
+4) Multiple cards
+--------------------------
+If you happen to be running multiple cards, it would be advisable to load
+the bttv module with the card id. This would help to solve any module loading
+problems that you might face.
+For example, if you have a Twinhan and Clones card along with a FusionHDTV5 Lite
+        $ modprobe bttv card=0x71 card=0x87
+Here the order of the card id is important and should be the same as that of the
+physical order of the cards. Here card=0x71 represents the Twinhan and clones
+and card=0x87 represents Fusion HDTV5 Lite. These arguments can also be
+specified in decimal, rather than hex:
+        $ modprobe bttv card=113 card=135
+Some examples of card-id's
+Pinnacle Sat            0x5e  (94)
+Nebula Digi TV          0x68  (104)
+PC HDTV                 0x70  (112)
+Twinhan                 0x71  (113)
+FusionHDTV DVB-T Lite   0x80  (128)
+FusionHDTV5 Lite        0x87  (135)
+For a full list of card-id's, see the V4L Documentation within the kernel
+source:  linux/Documentation/video4linux/CARDLIST.bttv
+If you have problems with this please do ask on the mailing list.
 --
 Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt
index efdc4ee9d40c..19329cf7b097 100644
--- a/Documentation/dvb/cards.txt
+++ b/Documentation/dvb/cards.txt
@@ -41,6 +41,12 @@ o Frontends drivers:
   - dib3000mb  : DiBcom 3000-MB demodulator
  DVB-S/C/T:
   - dst                : TwinHan DST Frontend
+  ATSC:
+   - nxt200x            : Nxtwave NXT2002 & NXT2004
+   - or51211            : or51211 based (pcHDTV HD2000 card)
+   - or51132            : or51132 based (pcHDTV HD3000 card)
+   - bcm3510            : Broadcom BCM3510
+   - lgdt330x           : LG Electronics DT3302 & DT3303
 o Cards based on the Phillips saa7146 multimedia PCI bridge chip:
@@ -62,6 +68,10 @@ o Cards based on the Conexant Bt8xx PCI bridge:
  - Nebula Electronics DigiTV
  - TwinHan DST
  - Avermedia DVB-T
+  - ChainTech digitop DST-1000 DVB-S
+  - pcHDTV HD-2000 TV
+  - DViCO FusionHDTV DVB-T Lite
+  - DViCO FusionHDTV5 Lite
 o Technotrend / Hauppauge DVB USB devices:
  - Nova USB
@@ -83,3 +93,30 @@ o DiBcom DVB-T USB based devices:
  - DiBcom USB2.0 DVB-T reference device (non-public)
 o Experimental support for the analog module of the Siemens DVB-C PCI card
+o Cards based on the Conexant cx2388x PCI bridge:
+  - ADS Tech Instant TV DVB-T PCI
+  - ATI HDTV Wonder
+  - digitalnow DNTV Live! DVB-T
+  - DViCO FusionHDTV DVB-T1
+  - DViCO FusionHDTV DVB-T Plus
+  - DViCO FusionHDTV3 Gold-Q
+  - DViCO FusionHDTV3 Gold-T
+  - DViCO FusionHDTV5 Gold
+  - Hauppauge Nova-T DVB-T
+  - KWorld/VStream XPert DVB-T
+  - pcHDTV HD3000 HDTV
+  - TerraTec Cinergy 1400 DVB-T
+  - WinFast DTV1000-T
+o Cards based on the Phillips saa7134 PCI bridge:
+  - Medion 7134
+  - Pinnacle PCTV 300i DVB-T + PAL
+  - LifeView FlyDVB-T DUO
+  - Typhoon DVB-T Duo Digital/Analog Cardbus
+  - Philips TOUGH DVB-T reference design
+  - Philips EUROPA V3 reference design
+  - Compro Videomate DVB-T300
+  - Compro Videomate DVB-T200
+  - AVerMedia AVerTVHD MCE A180
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt
index c9d5ce370701..2cbd2d0f6fdf 100644
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
@@ -75,5 +75,22 @@ Ernst Peinlich <e.peinlich@inode.at>
 Peter Beutner <p.beutner@gmx.net>
  for the IR code for the ttusb-dec driver
+Wilson Michaels <wilsonmichaels@earthlink.net>
+  for the lgdt330x frontend driver, and various bugfixes
+Michael Krufky <mkrufky@m1k.net>
+  for maintaining v4l/dvb inter-tree dependencies
+Taylor Jacob <rtjacob@earthlink.net>
+  for the nxt2002 frontend driver
+Jean-Francois Thibert <jeanfrancois@sagetv.com>
+  for the nxt2004 frontend driver
+Kirk Lapray <kirk.lapray@gmail.com>
+  for the or51211 and or51132 frontend drivers, and
+  for merging the nxt2002 and nxt2004 modules into a
+  single nxt200x frontend driver.
 (If you think you should be in this list, but you are not, drop a
 line to the DVB mailing list)
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index a750f0101d9d..be6eb4c75991 100644
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -22,7 +22,7 @@ use File::Temp qw/ tempdir /;
 use IO::Handle;
 @components = ( "sp8870", "sp887x", "tda10045", "tda10046", "av7110", "dec2000t",
-                "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002",
+                "dec2540t", "dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",
                "or51211", "or51132_qam", "or51132_vsb");
 # Check args
@@ -252,6 +252,23 @@ sub nxt2002 {
    $outfile;
 }
+sub nxt2004 {
+    my $sourcefile = "AVerTVHD_MCE_A180_Drv_v1.2.2.16.zip";
+    my $url = "http://www.aver.com/support/Drivers/$sourcefile";
+    my $hash = "111cb885b1e009188346d72acfed024c";
+    my $outfile = "dvb-fe-nxt2004.fw";
+    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
+    checkstandard();
+    wgetfile($sourcefile, $url);
+    unzip($sourcefile, $tmpdir);
+    verify("$tmpdir/3xHybrid.sys", $hash);
+    extract("$tmpdir/3xHybrid.sys", 465304, 9584, $outfile);
+    $outfile;
+}
 sub or51211 {
    my $fwfile = "dvb-fe-or51211.fw";
    my $url = "http://linuxtv.org/downloads/firmware/$fwfile";
diff --git a/Documentation/early-userspace/README b/Documentation/early-userspace/README
index 270a88e22fb9..cddbac456c29 100644
--- a/Documentation/early-userspace/README
+++ b/Documentation/early-userspace/README
@@ -28,7 +28,7 @@ the image from specifications.
 CPIO ARCHIVE method
 You can create a cpio archive that contains the early userspace image.
-Youre cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
+Your cpio archive should be specified in CONFIG_INITRAMFS_SOURCE and it
 will be used directly.  Only a single cpio file may be specified in
 CONFIG_INITRAMFS_SOURCE and directory and file names are not allowed in
 combination with a cpio archive.
diff --git a/Documentation/fb/fbcon.txt b/Documentation/fb/fbcon.txt
new file mode 100644
index 000000000000..08dce0f631bf
--- /dev/null
+++ b/Documentation/fb/fbcon.txt
@@ -0,0 +1,152 @@
+The Framebuffer Console
+=======================
+        The framebuffer console (fbcon), as its name implies, is a text
+console running on top of the framebuffer device. It has the functionality of
+any standard text console driver, such as the VGA console, with the added
+features that can be attributed to the graphical nature of the framebuffer.
+         In the x86 architecture, the framebuffer console is optional, and
+some even treat it as a toy. For other architectures, it is the only available
+display device, text or graphical.
+         What are the features of fbcon?  The framebuffer console supports
+high resolutions, varying font types, display rotation, primitive multihead,
+etc. Theoretically, multi-colored fonts, blending, aliasing, and any feature
+made available by the underlying graphics card are also possible.
+A. Configuration
+        The framebuffer console can be enabled by using your favorite kernel
+configuration tool.  It is under Device Drivers->Graphics Support->Support for
+framebuffer devices->Framebuffer Console Support. Select 'y' to compile
+support statically, or 'm' for module support.  The module will be fbcon.
+        In order for fbcon to activate, at least one framebuffer driver is
+required, so choose from any of the numerous drivers available. For x86
+systems, they almost universally have VGA cards, so vga16fb and vesafb will
+always be available. However, using a chipset-specific driver will give you
+more speed and features, such as the ability to change the video mode
+dynamically.
+        To display the penguin logo, choose any logo available in Logo
+Configuration->Boot up logo.
+        Also, you will need to select at least one compiled-in fonts, but if
+you don't do anything, the kernel configuration tool will select one for you,
+usually an 8x16 font.
+GOTCHA: A common bug report is enabling the framebuffer without enabling the
+framebuffer console.  Depending on the driver, you may get a blanked or
+garbled display, but the system still boots to completion.  If you are
+fortunate to have a driver that does not alter the graphics chip, then you
+will still get a VGA console.
+B. Loading
+Possible scenarios:
+1. Driver and fbcon are compiled statically
+         Usually, fbcon will automatically take over your console. The notable
+         exception is vesafb.  It needs to be explicitly activated with the
+         vga= boot option parameter.
+2. Driver is compiled statically, fbcon is compiled as a module
+         Depending on the driver, you either get a standard console, or a
+         garbled display, as mentioned above.  To get a framebuffer console,
+         do a 'modprobe fbcon'.
+3. Driver is compiled as a module, fbcon is compiled statically
+         You get your standard console.  Once the driver is loaded with
+         'modprobe xxxfb', fbcon automatically takes over the console with
+         the possible exception of using the fbcon=map:n option. See below.
+4. Driver and fbcon are compiled as a module.
+         You can load them in any order. Once both are loaded, fbcon will take
+         over the console.
+C. Boot options
+         The framebuffer console has several, largely unknown, boot options
+         that can change its behavior.
+1. fbcon=font:<name>
+        Select the initial font to use. The value 'name' can be any of the
+        compiled-in fonts: VGA8x16, 7x14, 10x18, VGA8x8, MINI4x6, RomanLarge,
+        SUN8x16, SUN12x22, ProFont6x11, Acorn8x8, PEARL8x8.
+        Note, not all drivers can handle font with widths not divisible by 8,
+        such as vga16fb.
+2. fbcon=scrollback:<value>[k]
+        The scrollback buffer is memory that is used to preserve display
+        contents that has already scrolled past your view.  This is accessed
+        by using the Shift-PageUp key combination.  The value 'value' is any
+        integer. It defaults to 32KB.  The 'k' suffix is optional, and will
+        multiply the 'value' by 1024.
+3. fbcon=map:<0123>
+        This is an interesting option. It tells which driver gets mapped to
+        which console. The value '0123' is a sequence that gets repeated until
+        the total length is 64 which is the number of consoles available. In
+        the above example, it is expanded to 012301230123... and the mapping
+        will be:
+                tty | 1 2 3 4 5 6 7 8 9 ...
+                fb  | 0 1 2 3 0 1 2 3 0 ...
+                ('cat /proc/fb' should tell you what the fb numbers are)
+        One side effect that may be useful is using a map value that exceeds
+        the number of loaded fb drivers. For example, if only one driver is
+        available, fb0, adding fbcon=map:1 tells fbcon not to take over the
+        console.
+        Later on, when you want to map the console the to the framebuffer
+        device, you can use the con2fbmap utility.
+4. fbcon=vc:<n1>-<n2>
+        This option tells fbcon to take over only a range of consoles as
+        specified by the values 'n1' and 'n2'. The rest of the consoles
+        outside the given range will still be controlled by the standard
+        console driver.
+        NOTE: For x86 machines, the standard console is the VGA console which
+        is typically located on the same video card.  Thus, the consoles that
+        are controlled by the VGA console will be garbled.
+4. fbcon=rotate:<n>
+        This option changes the orientation angle of the console display. The
+        value 'n' accepts the following:
+              0 - normal orientation (0 degree)
+              1 - clockwise orientation (90 degrees)
+              2 - upside down orientation (180 degrees)
+              3 - counterclockwise orientation (270 degrees)
+        The angle can be changed anytime afterwards by 'echoing' the same
+        numbers to any one of the 2 attributes found in
+        /sys/class/graphics/fb{x}
+                con_rotate     - rotate the display of the active console
+                con_rotate_all - rotate the display of all consoles
+        Console rotation will only become available if Console Rotation
+        Support is compiled in your kernel.
+        NOTE: This is purely console rotation.  Any other applications that
+        use the framebuffer will remain at their 'normal'orientation.
+        Actually, the underlying fb driver is totally ignorant of console
+        rotation.
+---
+Antonino Daplas <adaplas@pol.net>
diff --git a/Documentation/fb/vesafb.txt b/Documentation/fb/vesafb.txt
index 62db6758d1c1..ee277dd204b0 100644
--- a/Documentation/fb/vesafb.txt
+++ b/Documentation/fb/vesafb.txt
@@ -146,10 +146,10 @@ pmipal	Use the protected mode interface for palette changes.
 mtrr:n  setup memory type range registers for the vesafb framebuffer
        where n:
-              0 - disabled (equivalent to nomtrr)
+              0 - disabled (equivalent to nomtrr) (default)
              1 - uncachable
              2 - write-back
-              3 - write-combining (default)
+              3 - write-combining
              4 - write-through
        If you see the following in dmesg, choose the type that matches the
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index b67189a8d8d4..429db4bf98ec 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -25,6 +25,13 @@ Who:	Adrian Bunk <bunk@stusta.de>
 ---------------------------
+What:   drivers depending on OBSOLETE_OSS_DRIVER
+When:   January 2006
+Why:    OSS drivers with ALSA replacements
+Who:    Adrian Bunk <bunk@stusta.de>
+---------------------------
 What:   RCU API moves to EXPORT_SYMBOL_GPL
 When:   April 2006
 Files:  include/linux/rcupdate.h, kernel/rcupdate.c
@@ -60,6 +67,21 @@ Who:	Jody McIntyre <scjody@steamballoon.com>
 ---------------------------
+What:   Video4Linux API 1 ioctls and video_decoder.h from Video devices.
+When:   July 2006
+Why:    V4L1 AP1 was replaced by V4L2 API. during migration from 2.4 to 2.6
+        series. The old API have lots of drawbacks and don't provide enough
+        means to work with all video and audio standards. The newer API is
+        already available on the main drivers and should be used instead.
+        Newer drivers should use v4l_compat_translate_ioctl function to handle
+        old calls, replacing to newer ones.
+        Decoder iocts are using internally to allow video drivers to
+        communicate with video decoders. This should also be improved to allow
+        V4L2 calls being translated into compatible internal ioctls.
+Who:    Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+---------------------------
 What:   i2c sysfs name change: in1_ref, vid deprecated in favour of cpu0_vid
 When:   November 2005
 Files:  drivers/i2c/chips/adm1025.c, drivers/i2c/chips/adm1026.c
@@ -69,6 +91,22 @@ Who:	Grant Coady <gcoady@gmail.com>
 ---------------------------
+What:   remove EXPORT_SYMBOL(panic_timeout)
+When:   April 2006
+Files:  kernel/panic.c
+Why:    No modular usage in the kernel.
+Who:    Adrian Bunk <bunk@stusta.de>
+---------------------------
+What:   remove EXPORT_SYMBOL(insert_resource)
+When:   April 2006
+Files:  kernel/resource.c
+Why:    No modular usage in the kernel.
+Who:    Adrian Bunk <bunk@stusta.de>
+---------------------------
 What:   PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl])
 When:   November 2005
 Files:  drivers/pcmcia/: pcmcia_ioctl.c
@@ -95,3 +133,10 @@ Why:	This interface has been obsoleted by the new layer3-independent
        to link against API-compatible library on top of libnfnetlink_queue 
        instead of the current 'libipq'.
 Who:    Harald Welte <laforge@netfilter.org>
+---------------------------
+What:   EXPORT_SYMBOL(lookup_hash)
+When:   January 2006
+Why:    Too low-level interface.  Use lookup_one_len or lookup_create instead.
+Who:    Christoph Hellwig <hch@lst.de>
diff --git a/Documentation/filesystems/dentry-locking.txt b/Documentation/filesystems/dentry-locking.txt
new file mode 100644
index 000000000000..4c0c575a4012
--- /dev/null
+++ b/Documentation/filesystems/dentry-locking.txt
@@ -0,0 +1,173 @@
+RCU-based dcache locking model
+==============================
+On many workloads, the most common operation on dcache is to look up a
+dentry, given a parent dentry and the name of the child. Typically,
+for every open(), stat() etc., the dentry corresponding to the
+pathname will be looked up by walking the tree starting with the first
+component of the pathname and using that dentry along with the next
+component to look up the next level and so on. Since it is a frequent
+operation for workloads like multiuser environments and web servers,
+it is important to optimize this path.
+Prior to 2.5.10, dcache_lock was acquired in d_lookup and thus in
+every component during path look-up. Since 2.5.10 onwards, fast-walk
+algorithm changed this by holding the dcache_lock at the beginning and
+walking as many cached path component dentries as possible. This
+significantly decreases the number of acquisition of
+dcache_lock. However it also increases the lock hold time
+significantly and affects performance in large SMP machines. Since
+2.5.62 kernel, dcache has been using a new locking model that uses RCU
+to make dcache look-up lock-free.
+The current dcache locking model is not very different from the
+existing dcache locking model. Prior to 2.5.62 kernel, dcache_lock
+protected the hash chain, d_child, d_alias, d_lru lists as well as
+d_inode and several other things like mount look-up. RCU-based changes
+affect only the way the hash chain is protected. For everything else
+the dcache_lock must be taken for both traversing as well as
+updating. The hash chain updates too take the dcache_lock.  The
+significant change is the way d_lookup traverses the hash chain, it
+doesn't acquire the dcache_lock for this and rely on RCU to ensure
+that the dentry has not been *freed*.
+Dcache locking details
+======================
+For many multi-user workloads, open() and stat() on files are very
+frequently occurring operations. Both involve walking of path names to
+find the dentry corresponding to the concerned file. In 2.4 kernel,
+dcache_lock was held during look-up of each path component. Contention
+and cache-line bouncing of this global lock caused significant
+scalability problems. With the introduction of RCU in Linux kernel,
+this was worked around by making the look-up of path components during
+path walking lock-free.
+Safe lock-free look-up of dcache hash table
+===========================================
+Dcache is a complex data structure with the hash table entries also
+linked together in other lists. In 2.4 kernel, dcache_lock protected
+all the lists. We applied RCU only on hash chain walking. The rest of
+the lists are still protected by dcache_lock.  Some of the important
+changes are :
+1. The deletion from hash chain is done using hlist_del_rcu() macro
+   which doesn't initialize next pointer of the deleted dentry and
+   this allows us to walk safely lock-free while a deletion is
+   happening.
+2. Insertion of a dentry into the hash table is done using
+   hlist_add_head_rcu() which take care of ordering the writes - the
+   writes to the dentry must be visible before the dentry is
+   inserted. This works in conjunction with hlist_for_each_rcu() while
+   walking the hash chain. The only requirement is that all
+   initialization to the dentry must be done before
+   hlist_add_head_rcu() since we don't have dcache_lock protection
+   while traversing the hash chain. This isn't different from the
+   existing code.
+3. The dentry looked up without holding dcache_lock by cannot be
+   returned for walking if it is unhashed. It then may have a NULL
+   d_inode or other bogosity since RCU doesn't protect the other
+   fields in the dentry. We therefore use a flag DCACHE_UNHASHED to
+   indicate unhashed dentries and use this in conjunction with a
+   per-dentry lock (d_lock). Once looked up without the dcache_lock,
+   we acquire the per-dentry lock (d_lock) and check if the dentry is
+   unhashed. If so, the look-up is failed. If not, the reference count
+   of the dentry is increased and the dentry is returned.
+4. Once a dentry is looked up, it must be ensured during the path walk
+   for that component it doesn't go away. In pre-2.5.10 code, this was
+   done holding a reference to the dentry. dcache_rcu does the same.
+   In some sense, dcache_rcu path walking looks like the pre-2.5.10
+   version.
+5. All dentry hash chain updates must take the dcache_lock as well as
+   the per-dentry lock in that order. dput() does this to ensure that
+   a dentry that has just been looked up in another CPU doesn't get
+   deleted before dget() can be done on it.
+6. There are several ways to do reference counting of RCU protected
+   objects. One such example is in ipv4 route cache where deferred
+   freeing (using call_rcu()) is done as soon as the reference count
+   goes to zero. This cannot be done in the case of dentries because
+   tearing down of dentries require blocking (dentry_iput()) which
+   isn't supported from RCU callbacks. Instead, tearing down of
+   dentries happen synchronously in dput(), but actual freeing happens
+   later when RCU grace period is over. This allows safe lock-free
+   walking of the hash chains, but a matched dentry may have been
+   partially torn down. The checking of DCACHE_UNHASHED flag with
+   d_lock held detects such dentries and prevents them from being
+   returned from look-up.
+Maintaining POSIX rename semantics
+==================================
+Since look-up of dentries is lock-free, it can race against a
+concurrent rename operation. For example, during rename of file A to
+B, look-up of either A or B must succeed.  So, if look-up of B happens
+after A has been removed from the hash chain but not added to the new
+hash chain, it may fail.  Also, a comparison while the name is being
+written concurrently by a rename may result in false positive matches
+violating rename semantics.  Issues related to race with rename are
+handled as described below :
+1. Look-up can be done in two ways - d_lookup() which is safe from
+   simultaneous renames and __d_lookup() which is not.  If
+   __d_lookup() fails, it must be followed up by a d_lookup() to
+   correctly determine whether a dentry is in the hash table or
+   not. d_lookup() protects look-ups using a sequence lock
+   (rename_lock).
+2. The name associated with a dentry (d_name) may be changed if a
+   rename is allowed to happen simultaneously. To avoid memcmp() in
+   __d_lookup() go out of bounds due to a rename and false positive
+   comparison, the name comparison is done while holding the
+   per-dentry lock. This prevents concurrent renames during this
+   operation.
+3. Hash table walking during look-up may move to a different bucket as
+   the current dentry is moved to a different bucket due to rename.
+   But we use hlists in dcache hash table and they are
+   null-terminated.  So, even if a dentry moves to a different bucket,
+   hash chain walk will terminate. [with a list_head list, it may not
+   since termination is when the list_head in the original bucket is
+   reached].  Since we redo the d_parent check and compare name while
+   holding d_lock, lock-free look-up will not race against d_move().
+4. There can be a theoretical race when a dentry keeps coming back to
+   original bucket due to double moves. Due to this look-up may
+   consider that it has never moved and can end up in a infinite loop.
+   But this is not any worse that theoretical livelocks we already
+   have in the kernel.
+Important guidelines for filesystem developers related to dcache_rcu
+====================================================================
+1. Existing dcache interfaces (pre-2.5.62) exported to filesystem
+   don't change. Only dcache internal implementation changes. However
+   filesystems *must not* delete from the dentry hash chains directly
+   using the list macros like allowed earlier. They must use dcache
+   APIs like d_drop() or __d_drop() depending on the situation.
+2. d_flags is now protected by a per-dentry lock (d_lock). All access
+   to d_flags must be protected by it.
+3. For a hashed dentry, checking of d_count needs to be protected by
+   d_lock.
+Papers and other documentation on dcache locking
+================================================
+1. Scaling dcache with RCU (http://linuxjournal.com/article.php?sid=7124).
+2. http://lse.sourceforge.net/locking/dcache/dcache.html
diff --git a/Documentation/filesystems/devfs/README b/Documentation/filesystems/devfs/README
index 54366ecc241f..aabfba24bc2e 100644
--- a/Documentation/filesystems/devfs/README
+++ b/Documentation/filesystems/devfs/README
@@ -1812,11 +1812,6 @@ it may overflow the messages buffer, but try to get as much of it as
 you can
-if you get an Oops, run ksymoops to decode it so that the
-names of the offending functions are provided. A non-decoded Oops is
-pretty useless
 send a copy of your devfsd configuration file(s)
 send the bug report to me first.
diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index d16334ec48ba..a8edb376b041 100644
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -17,8 +17,6 @@ set using tune2fs(8). Kernel-determined defaults are indicated by (*).
 bsddf                   (*)     Makes `df' act like BSD.
 minixdf                         Makes `df' act like Minix.
-check                           Check block and inode bitmaps at mount time
-                                (requires CONFIG_EXT2_CHECK).
 check=none, nocheck     (*)     Don't do extra checking of bitmaps on mount
                                (check=normal and check=strict options removed)
diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
new file mode 100644
index 000000000000..b3404a032596
--- /dev/null
+++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
@@ -0,0 +1,195 @@
+ramfs, rootfs and initramfs
+October 17, 2005
+Rob Landley <rob@landley.net>
+=============================
+What is ramfs?
+--------------
+Ramfs is a very simple filesystem that exports Linux's disk caching
+mechanisms (the page cache and dentry cache) as a dynamically resizable
+ram-based filesystem.
+Normally all files are cached in memory by Linux.  Pages of data read from
+backing store (usually the block device the filesystem is mounted on) are kept
+around in case it's needed again, but marked as clean (freeable) in case the
+Virtual Memory system needs the memory for something else.  Similarly, data
+written to files is marked clean as soon as it has been written to backing
+store, but kept around for caching purposes until the VM reallocates the
+memory.  A similar mechanism (the dentry cache) greatly speeds up access to
+directories.
+With ramfs, there is no backing store.  Files written into ramfs allocate
+dentries and page cache as usual, but there's nowhere to write them to.
+This means the pages are never marked clean, so they can't be freed by the
+VM when it's looking to recycle memory.
+The amount of code required to implement ramfs is tiny, because all the
+work is done by the existing Linux caching infrastructure.  Basically,
+you're mounting the disk cache as a filesystem.  Because of this, ramfs is not
+an optional component removable via menuconfig, since there would be negligible
+space savings.
+ramfs and ramdisk:
+------------------
+The older "ram disk" mechanism created a synthetic block device out of
+an area of ram and used it as backing store for a filesystem.  This block
+device was of fixed size, so the filesystem mounted on it was of fixed
+size.  Using a ram disk also required unnecessarily copying memory from the
+fake block device into the page cache (and copying changes back out), as well
+as creating and destroying dentries.  Plus it needed a filesystem driver
+(such as ext2) to format and interpret this data.
+Compared to ramfs, this wastes memory (and memory bus bandwidth), creates
+unnecessary work for the CPU, and pollutes the CPU caches.  (There are tricks
+to avoid this copying by playing with the page tables, but they're unpleasantly
+complicated and turn out to be about as expensive as the copying anyway.)
+More to the point, all the work ramfs is doing has to happen _anyway_,
+since all file access goes through the page and dentry caches.  The ram
+disk is simply unnecessary, ramfs is internally much simpler.
+Another reason ramdisks are semi-obsolete is that the introduction of
+loopback devices offered a more flexible and convenient way to create
+synthetic block devices, now from files instead of from chunks of memory.
+See losetup (8) for details.
+ramfs and tmpfs:
+----------------
+One downside of ramfs is you can keep writing data into it until you fill
+up all memory, and the VM can't free it because the VM thinks that files
+should get written to backing store (rather than swap space), but ramfs hasn't
+got any backing store.  Because of this, only root (or a trusted user) should
+be allowed write access to a ramfs mount.
+A ramfs derivative called tmpfs was created to add size limits, and the ability
+to write the data to swap space.  Normal users can be allowed write access to
+tmpfs mounts.  See Documentation/filesystems/tmpfs.txt for more information.
+What is rootfs?
+---------------
+Rootfs is a special instance of ramfs, which is always present in 2.6 systems.
+(It's used internally as the starting and stopping point for searches of the
+kernel's doubly-linked list of mount points.)
+Most systems just mount another filesystem over it and ignore it.  The
+amount of space an empty instance of ramfs takes up is tiny.
+What is initramfs?
+------------------
+All 2.6 Linux kernels contain a gzipped "cpio" format archive, which is
+extracted into rootfs when the kernel boots up.  After extracting, the kernel
+checks to see if rootfs contains a file "init", and if so it executes it as PID
+1.  If found, this init process is responsible for bringing the system the
+rest of the way up, including locating and mounting the real root device (if
+any).  If rootfs does not contain an init program after the embedded cpio
+archive is extracted into it, the kernel will fall through to the older code
+to locate and mount a root partition, then exec some variant of /sbin/init
+out of that.
+All this differs from the old initrd in several ways:
+  - The old initrd was a separate file, while the initramfs archive is linked
+    into the linux kernel image.  (The directory linux-*/usr is devoted to
+    generating this archive during the build.)
+  - The old initrd file was a gzipped filesystem image (in some file format,
+    such as ext2, that had to be built into the kernel), while the new
+    initramfs archive is a gzipped cpio archive (like tar only simpler,
+    see cpio(1) and Documentation/early-userspace/buffer-format.txt).
+  - The program run by the old initrd (which was called /initrd, not /init) did
+    some setup and then returned to the kernel, while the init program from
+    initramfs is not expected to return to the kernel.  (If /init needs to hand
+    off control it can overmount / with a new root device and exec another init
+    program.  See the switch_root utility, below.)
+  - When switching another root device, initrd would pivot_root and then
+    umount the ramdisk.  But initramfs is rootfs: you can neither pivot_root
+    rootfs, nor unmount it.  Instead delete everything out of rootfs to
+    free up the space (find -xdev / -exec rm '{}' ';'), overmount rootfs
+    with the new root (cd /newmount; mount --move . /; chroot .), attach
+    stdin/stdout/stderr to the new /dev/console, and exec the new init.
+    Since this is a remarkably persnickity process (and involves deleting
+    commands before you can run them), the klibc package introduced a helper
+    program (utils/run_init.c) to do all this for you.  Most other packages
+    (such as busybox) have named this command "switch_root".
+Populating initramfs:
+---------------------
+The 2.6 kernel build process always creates a gzipped cpio format initramfs
+archive and links it into the resulting kernel binary.  By default, this
+archive is empty (consuming 134 bytes on x86).  The config option
+CONFIG_INITRAMFS_SOURCE (for some reason buried under devices->block devices
+in menuconfig, and living in usr/Kconfig) can be used to specify a source for
+the initramfs archive, which will automatically be incorporated into the
+resulting binary.  This option can point to an existing gzipped cpio archive, a
+directory containing files to be archived, or a text file specification such
+as the following example:
+  dir /dev 755 0 0
+  nod /dev/console 644 0 0 c 5 1
+  nod /dev/loop0 644 0 0 b 7 0
+  dir /bin 755 1000 1000
+  slink /bin/sh busybox 777 0 0
+  file /bin/busybox initramfs/busybox 755 0 0
+  dir /proc 755 0 0
+  dir /sys 755 0 0
+  dir /mnt 755 0 0
+  file /init initramfs/init.sh 755 0 0
+One advantage of the text file is that root access is not required to
+set permissions or create device nodes in the new archive.  (Note that those
+two example "file" entries expect to find files named "init.sh" and "busybox" in
+a directory called "initramfs", under the linux-2.6.* directory.  See
+Documentation/early-userspace/README for more details.)
+If you don't already understand what shared libraries, devices, and paths
+you need to get a minimal root filesystem up and running, here are some
+references:
+http://www.tldp.org/HOWTO/Bootdisk-HOWTO/
+http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html
+http://www.linuxfromscratch.org/lfs/view/stable/
+The "klibc" package (http://www.kernel.org/pub/linux/libs/klibc) is
+designed to be a tiny C library to statically link early userspace
+code against, along with some related utilities.  It is BSD licensed.
+I use uClibc (http://www.uclibc.org) and busybox (http://www.busybox.net)
+myself.  These are LGPL and GPL, respectively.
+In theory you could use glibc, but that's not well suited for small embedded
+uses like this.  (A "hello world" program statically linked against glibc is
+over 400k.  With uClibc it's 7k.  Also note that glibc dlopens libnss to do
+name lookups, even when otherwise statically linked.)
+Future directions:
+------------------
+Today (2.6.14), initramfs is always compiled in, but not always used.  The
+kernel falls back to legacy boot code that is reached only if initramfs does
+not contain an /init program.  The fallback is legacy code, there to ensure a
+smooth transition and allowing early boot functionality to gradually move to
+"early userspace" (I.E. initramfs).
+The move to early userspace is necessary because finding and mounting the real
+root device is complex.  Root partitions can span multiple devices (raid or
+separate journal).  They can be out on the network (requiring dhcp, setting a
+specific mac address, logging into a server, etc).  They can live on removable
+media, with dynamically allocated major/minor numbers and persistent naming
+issues requiring a full udev implementation to sort out.  They can be
+compressed, encrypted, copy-on-write, loopback mounted, strangely partitioned,
+and so on.
+This kind of complexity (which inevitably includes policy) is rightly handled
+in userspace.  Both klibc and busybox/uClibc are working on simple initramfs
+packages to drop into a kernel build, and when standard solutions are ready
+and widely deployed, the kernel's legacy early boot code will become obsolete
+and a candidate for the feature removal schedule.
+But that's a while off yet.
diff --git a/Documentation/filesystems/vfs.txt b/Documentation/filesystems/vfs.txt
index f042c12e0ed2..ee4c0a8b8db7 100644
--- a/Documentation/filesystems/vfs.txt
+++ b/Documentation/filesystems/vfs.txt
@@ -3,7 +3,7 @@
        Original author: Richard Gooch <rgooch@atnf.csiro.au>
-                  Last updated on August 25, 2005
+                  Last updated on October 28, 2005
  Copyright (C) 1999 Richard Gooch
  Copyright (C) 2005 Pekka Enberg
@@ -11,62 +11,61 @@
  This file is released under the GPLv2.
-What is it?
+Introduction
-===========
+============
-The Virtual File System (otherwise known as the Virtual Filesystem
+The Virtual File System (also known as the Virtual Filesystem Switch)
-Switch) is the software layer in the kernel that provides the
+is the software layer in the kernel that provides the filesystem
-filesystem interface to userspace programs. It also provides an
+interface to userspace programs. It also provides an abstraction
-abstraction within the kernel which allows different filesystem
+within the kernel which allows different filesystem implementations to
-implementations to coexist.
+coexist.
+VFS system calls open(2), stat(2), read(2), write(2), chmod(2) and so
+on are called from a process context. Filesystem locking is described
+in the document Documentation/filesystems/Locking.
-A Quick Look At How It Works
-============================
-In this section I'll briefly describe how things work, before
+Directory Entry Cache (dcache)
-launching into the details. I'll start with describing what happens
+------------------------------
-when user programs open and manipulate files, and then look from the
-other view which is how a filesystem is supported and subsequently
-mounted.
-Opening a File
--------------
-The VFS implements the open(2), stat(2), chmod(2) and similar system
-calls. The pathname argument is used by the VFS to search through the
-directory entry cache (dentry cache or "dcache"). This provides a very
-fast look-up mechanism to translate a pathname (filename) into a
-specific dentry.
-An individual dentry usually has a pointer to an inode. Inodes are the
-things that live on disc drives, and can be regular files (you know:
-those things that you write data into), directories, FIFOs and other
-beasts. Dentries live in RAM and are never saved to disc: they exist
-only for performance. Inodes live on disc and are copied into memory
-when required. Later any changes are written back to disc. The inode
-that lives in RAM is a VFS inode, and it is this which the dentry
-points to. A single inode can be pointed to by multiple dentries
-(think about hardlinks).
-The dcache is meant to be a view into your entire filespace. Unlike
-Linus, most of us losers can't fit enough dentries into RAM to cover
-all of our filespace, so the dcache has bits missing. In order to
-resolve your pathname into a dentry, the VFS may have to resort to
-creating dentries along the way, and then loading the inode. This is
-done by looking up the inode.
-To look up an inode (usually read from disc) requires that the VFS
-calls the lookup() method of the parent directory inode. This method
-is installed by the specific filesystem implementation that the inode
-lives in. There will be more on this later.
-Once the VFS has the required dentry (and hence the inode), we can do
+The VFS implements the open(2), stat(2), chmod(2), and similar system
-all those boring things like open(2) the file, or stat(2) it to peek
+calls. The pathname argument that is passed to them is used by the VFS
-at the inode data. The stat(2) operation is fairly simple: once the
+to search through the directory entry cache (also known as the dentry
-VFS has the dentry, it peeks at the inode data and passes some of it
+cache or dcache). This provides a very fast look-up mechanism to
-back to userspace.
+translate a pathname (filename) into a specific dentry. Dentries live
+in RAM and are never saved to disc: they exist only for performance.
+The dentry cache is meant to be a view into your entire filespace. As
+most computers cannot fit all dentries in the RAM at the same time,
+some bits of the cache are missing. In order to resolve your pathname
+into a dentry, the VFS may have to resort to creating dentries along
+the way, and then loading the inode. This is done by looking up the
+inode.
+The Inode Object
+----------------
+An individual dentry usually has a pointer to an inode. Inodes are
+filesystem objects such as regular files, directories, FIFOs and other
+beasts.  They live either on the disc (for block device filesystems)
+or in the memory (for pseudo filesystems). Inodes that live on the
+disc are copied into the memory when required and changes to the inode
+are written back to disc. A single inode can be pointed to by multiple
+dentries (hard links, for example, do this).
+To look up an inode requires that the VFS calls the lookup() method of
+the parent directory inode. This method is installed by the specific
+filesystem implementation that the inode lives in. Once the VFS has
+the required dentry (and hence the inode), we can do all those boring
+things like open(2) the file, or stat(2) it to peek at the inode
+data. The stat(2) operation is fairly simple: once the VFS has the
+dentry, it peeks at the inode data and passes some of it back to
+userspace.
+The File Object
+---------------
 Opening a file requires another operation: allocation of a file
 structure (this is the kernel-side implementation of file
@@ -74,51 +73,39 @@ descriptors). The freshly allocated file structure is initialized with
 a pointer to the dentry and a set of file operation member functions.
 These are taken from the inode data. The open() file method is then
 called so the specific filesystem implementation can do it's work. You
-can see that this is another switch performed by the VFS.
+can see that this is another switch performed by the VFS. The file
+structure is placed into the file descriptor table for the process.
-The file structure is placed into the file descriptor table for the
-process.
 Reading, writing and closing files (and other assorted VFS operations)
 is done by using the userspace file descriptor to grab the appropriate
-file structure, and then calling the required file structure method
+file structure, and then calling the required file structure method to
-function to do whatever is required.
+do whatever is required. For as long as the file is open, it keeps the
+dentry in use, which in turn means that the VFS inode is still in use.
-For as long as the file is open, it keeps the dentry "open" (in use),
-which in turn means that the VFS inode is still in use.
-All VFS system calls (i.e. open(2), stat(2), read(2), write(2),
-chmod(2) and so on) are called from a process context. You should
-assume that these calls are made without any kernel locks being
-held. This means that the processes may be executing the same piece of
-filesystem or driver code at the same time, on different
-processors. You should ensure that access to shared resources is
-protected by appropriate locks.
 Registering and Mounting a Filesystem
-------------------------------------
+=====================================
-If you want to support a new kind of filesystem in the kernel, all you
+To register and unregister a filesystem, use the following API
-need to do is call register_filesystem(). You pass a structure
+functions:
-describing the filesystem implementation (struct file_system_type)
-which is then added to an internal table of supported filesystems. You
-can do:
-% cat /proc/filesystems
+   #include <linux/fs.h>
-to see what filesystems are currently available on your system.
+   extern int register_filesystem(struct file_system_type *);
+   extern int unregister_filesystem(struct file_system_type *);
-When a request is made to mount a block device onto a directory in
+The passed struct file_system_type describes your filesystem. When a
-your filespace the VFS will call the appropriate method for the
+request is made to mount a device onto a directory in your filespace,
-specific filesystem. The dentry for the mount point will then be
+the VFS will call the appropriate get_sb() method for the specific
-updated to point to the root inode for the new filesystem.
+filesystem. The dentry for the mount point will then be updated to
+point to the root inode for the new filesystem.
-It's now time to look at things in more detail.
+You can see all filesystems that are registered to the kernel in the
+file /proc/filesystems.
 struct file_system_type
-=======================
+-----------------------
 This describes the filesystem. As of kernel 2.6.13, the following
 members are defined:
@@ -197,8 +184,14 @@ A fill_super() method implementation has the following arguments:
  int silent: whether or not to be silent on error
+The Superblock Object
+=====================
+A superblock object represents a mounted filesystem.
 struct super_operations
-=======================
+-----------------------
 This describes how the VFS can manipulate the superblock of your
 filesystem. As of kernel 2.6.13, the following members are defined:
@@ -286,9 +279,9 @@ or bottom half).
        a superblock. The second parameter indicates whether the method
        should wait until the write out has been completed. Optional.
-  write_super_lockfs: called when VFS is locking a filesystem and forcing
+  write_super_lockfs: called when VFS is locking a filesystem and
-        it into a consistent state.  This function is currently used by the
+        forcing it into a consistent state.  This method is currently
-        Logical Volume Manager (LVM).
+        used by the Logical Volume Manager (LVM).
  unlockfs: called when VFS is unlocking a filesystem and making it writable
        again.
@@ -317,8 +310,14 @@ field. This is a pointer to a "struct inode_operations" which
 describes the methods that can be performed on individual inodes.
+The Inode Object
+================
+An inode object represents an object within the filesystem.
 struct inode_operations
-=======================
+-----------------------
 This describes how the VFS can manipulate an inode in your
 filesystem. As of kernel 2.6.13, the following members are defined:
@@ -394,51 +393,62 @@ otherwise noted.
        will probably need to call d_instantiate() just as you would
        in the create() method
+  rename: called by the rename(2) system call to rename the object to
+        have the parent and name given by the second inode and dentry.
  readlink: called by the readlink(2) system call. Only required if
        you want to support reading symbolic links
  follow_link: called by the VFS to follow a symbolic link to the
        inode it points to.  Only required if you want to support
-        symbolic links.  This function returns a void pointer cookie
+        symbolic links.  This method returns a void pointer cookie
        that is passed to put_link().
  put_link: called by the VFS to release resources allocated by
-        follow_link().  The cookie returned by follow_link() is passed to
+        follow_link().  The cookie returned by follow_link() is passed
-        to this function as the last parameter.  It is used by filesystems
+        to to this method as the last parameter.  It is used by
-        such as NFS where page cache is not stable (i.e. page that was
+        filesystems such as NFS where page cache is not stable
-        installed when the symbolic link walk started might not be in the
+        (i.e. page that was installed when the symbolic link walk
-        page cache at the end of the walk).
+        started might not be in the page cache at the end of the
+        walk).
-  truncate: called by the VFS to change the size of a file.  The i_size
-        field of the inode is set to the desired size by the VFS before
+  truncate: called by the VFS to change the size of a file.  The
-        this function is called.  This function is called by the truncate(2)
+        i_size field of the inode is set to the desired size by the
-        system call and related functionality.
+        VFS before this method is called.  This method is called by
+        the truncate(2) system call and related functionality.
  permission: called by the VFS to check for access rights on a POSIX-like
        filesystem.
-  setattr: called by the VFS to set attributes for a file.  This function is
+  setattr: called by the VFS to set attributes for a file. This method
-        called by chmod(2) and related system calls.
+        is called by chmod(2) and related system calls.
-  getattr: called by the VFS to get attributes of a file.  This function is
+  getattr: called by the VFS to get attributes of a file. This method
-        called by stat(2) and related system calls.
+        is called by stat(2) and related system calls.
  setxattr: called by the VFS to set an extended attribute for a file.
-        Extended attribute is a name:value pair associated with an inode. This
+        Extended attribute is a name:value pair associated with an
-        function is called by setxattr(2) system call.
+        inode. This method is called by setxattr(2) system call.
+  getxattr: called by the VFS to retrieve the value of an extended
+        attribute name. This method is called by getxattr(2) function
+        call.
-  getxattr: called by the VFS to retrieve the value of an extended attribute
+  listxattr: called by the VFS to list all extended attributes for a
-        name.  This function is called by getxattr(2) function call.
+        given file. This method is called by listxattr(2) system call.
-  listxattr: called by the VFS to list all extended attributes for a given
+  removexattr: called by the VFS to remove an extended attribute from
-        file.  This function is called by listxattr(2) system call.
+        a file. This method is called by removexattr(2) system call.
-  removexattr: called by the VFS to remove an extended attribute from a file.
-        This function is called by removexattr(2) system call.
+The Address Space Object
+========================
+The address space object is used to identify pages in the page cache.
 struct address_space_operations
-===============================
+-------------------------------
 This describes how the VFS can manipulate mapping of a file to page cache in
 your filesystem. As of kernel 2.6.13, the following members are defined:
@@ -502,8 +512,14 @@ struct address_space_operations {
        it.  An example implementation can be found in fs/ext2/xip.c.
+The File Object
+===============
+A file object represents a file opened by a process.
 struct file_operations
-======================
+----------------------
 This describes how the VFS can manipulate an open file. As of kernel
 2.6.13, the following members are defined:
@@ -661,7 +677,7 @@ of child dentries. Child dentries are basically like files in a
 directory.
-Directory Entry Cache APIs
+Directory Entry Cache API
 --------------------------
 There are a number of functions defined which permit a filesystem to
@@ -705,178 +721,24 @@ manipulate dentries:
        and the dentry is returned. The caller must use d_put()
        to free the dentry when it finishes using it.
+For further information on dentry locking, please refer to the document
+Documentation/filesystems/dentry-locking.txt.
-RCU-based dcache locking model
------------------------------
-On many workloads, the most common operation on dcache is
+Resources
-to look up a dentry, given a parent dentry and the name
+=========
-of the child. Typically, for every open(), stat() etc.,
-the dentry corresponding to the pathname will be looked
+(Note some of these resources are not up-to-date with the latest kernel
-up by walking the tree starting with the first component
+ version.)
-of the pathname and using that dentry along with the next
-component to look up the next level and so on. Since it
+Creating Linux virtual filesystems. 2002
-is a frequent operation for workloads like multiuser
+    <http://lwn.net/Articles/13325/>
-environments and web servers, it is important to optimize
-this path.
+The Linux Virtual File-system Layer by Neil Brown. 1999
+    <http://www.cse.unsw.edu.au/~neilb/oss/linux-commentary/vfs.html>
-Prior to 2.5.10, dcache_lock was acquired in d_lookup and thus
-in every component during path look-up. Since 2.5.10 onwards,
+A tour of the Linux VFS by Michael K. Johnson. 1996
-fast-walk algorithm changed this by holding the dcache_lock
+    <http://www.tldp.org/LDP/khg/HyperNews/get/fs/vfstour.html>
-at the beginning and walking as many cached path component
-dentries as possible. This significantly decreases the number
-of acquisition of dcache_lock. However it also increases the
-lock hold time significantly and affects performance in large
-SMP machines. Since 2.5.62 kernel, dcache has been using
-a new locking model that uses RCU to make dcache look-up
-lock-free.
-The current dcache locking model is not very different from the existing
-dcache locking model. Prior to 2.5.62 kernel, dcache_lock
-protected the hash chain, d_child, d_alias, d_lru lists as well
-as d_inode and several other things like mount look-up. RCU-based
-changes affect only the way the hash chain is protected. For everything
-else the dcache_lock must be taken for both traversing as well as
-updating. The hash chain updates too take the dcache_lock.
-The significant change is the way d_lookup traverses the hash chain,
-it doesn't acquire the dcache_lock for this and rely on RCU to
-ensure that the dentry has not been *freed*.
-Dcache locking details
----------------------
-For many multi-user workloads, open() and stat() on files are
+A small trail through the Linux kernel by Andries Brouwer. 2001
-very frequently occurring operations. Both involve walking
+    <http://www.win.tue.nl/~aeb/linux/vfs/trail.html>
-of path names to find the dentry corresponding to the
-concerned file. In 2.4 kernel, dcache_lock was held
-during look-up of each path component. Contention and
-cache-line bouncing of this global lock caused significant
-scalability problems. With the introduction of RCU
-in Linux kernel, this was worked around by making
-the look-up of path components during path walking lock-free.
-Safe lock-free look-up of dcache hash table
-===========================================
-Dcache is a complex data structure with the hash table entries
-also linked together in other lists. In 2.4 kernel, dcache_lock
-protected all the lists. We applied RCU only on hash chain
-walking. The rest of the lists are still protected by dcache_lock.
-Some of the important changes are :
-1. The deletion from hash chain is done using hlist_del_rcu() macro which
-   doesn't initialize next pointer of the deleted dentry and this
-   allows us to walk safely lock-free while a deletion is happening.
-2. Insertion of a dentry into the hash table is done using
-   hlist_add_head_rcu() which take care of ordering the writes -
-   the writes to the dentry must be visible before the dentry
-   is inserted. This works in conjunction with hlist_for_each_rcu()
-   while walking the hash chain. The only requirement is that
-   all initialization to the dentry must be done before hlist_add_head_rcu()
-   since we don't have dcache_lock protection while traversing
-   the hash chain. This isn't different from the existing code.
-3. The dentry looked up without holding dcache_lock by cannot be
-   returned for walking if it is unhashed. It then may have a NULL
-   d_inode or other bogosity since RCU doesn't protect the other
-   fields in the dentry. We therefore use a flag DCACHE_UNHASHED to
-   indicate unhashed  dentries and use this in conjunction with a
-   per-dentry lock (d_lock). Once looked up without the dcache_lock,
-   we acquire the per-dentry lock (d_lock) and check if the
-   dentry is unhashed. If so, the look-up is failed. If not, the
-   reference count of the dentry is increased and the dentry is returned.
-4. Once a dentry is looked up, it must be ensured during the path
-   walk for that component it doesn't go away. In pre-2.5.10 code,
-   this was done holding a reference to the dentry. dcache_rcu does
-   the same.  In some sense, dcache_rcu path walking looks like
-   the pre-2.5.10 version.
-5. All dentry hash chain updates must take the dcache_lock as well as
-   the per-dentry lock in that order. dput() does this to ensure
-   that a dentry that has just been looked up in another CPU
-   doesn't get deleted before dget() can be done on it.
-6. There are several ways to do reference counting of RCU protected
-   objects. One such example is in ipv4 route cache where
-   deferred freeing (using call_rcu()) is done as soon as
-   the reference count goes to zero. This cannot be done in
-   the case of dentries because tearing down of dentries
-   require blocking (dentry_iput()) which isn't supported from
-   RCU callbacks. Instead, tearing down of dentries happen
-   synchronously in dput(), but actual freeing happens later
-   when RCU grace period is over. This allows safe lock-free
-   walking of the hash chains, but a matched dentry may have
-   been partially torn down. The checking of DCACHE_UNHASHED
-   flag with d_lock held detects such dentries and prevents
-   them from being returned from look-up.
-Maintaining POSIX rename semantics
-==================================
-Since look-up of dentries is lock-free, it can race against
-a concurrent rename operation. For example, during rename
-of file A to B, look-up of either A or B must succeed.
-So, if look-up of B happens after A has been removed from the
-hash chain but not added to the new hash chain, it may fail.
-Also, a comparison while the name is being written concurrently
-by a rename may result in false positive matches violating
-rename semantics.  Issues related to race with rename are
-handled as described below :
-1. Look-up can be done in two ways - d_lookup() which is safe
-   from simultaneous renames and __d_lookup() which is not.
-   If __d_lookup() fails, it must be followed up by a d_lookup()
-   to correctly determine whether a dentry is in the hash table
-   or not. d_lookup() protects look-ups using a sequence
-   lock (rename_lock).
-2. The name associated with a dentry (d_name) may be changed if
-   a rename is allowed to happen simultaneously. To avoid memcmp()
-   in __d_lookup() go out of bounds due to a rename and false
-   positive comparison, the name comparison is done while holding the
-   per-dentry lock. This prevents concurrent renames during this
-   operation.
-3. Hash table walking during look-up may move to a different bucket as
-   the current dentry is moved to a different bucket due to rename.
-   But we use hlists in dcache hash table and they are null-terminated.
-   So, even if a dentry moves to a different bucket, hash chain
-   walk will terminate. [with a list_head list, it may not since
-   termination is when the list_head in the original bucket is reached].
-   Since we redo the d_parent check and compare name while holding
-   d_lock, lock-free look-up will not race against d_move().
-4. There can be a theoretical race when a dentry keeps coming back
-   to original bucket due to double moves. Due to this look-up may
-   consider that it has never moved and can end up in a infinite loop.
-   But this is not any worse that theoretical livelocks we already
-   have in the kernel.
-Important guidelines for filesystem developers related to dcache_rcu
-====================================================================
-1. Existing dcache interfaces (pre-2.5.62) exported to filesystem
-   don't change. Only dcache internal implementation changes. However
-   filesystems *must not* delete from the dentry hash chains directly
-   using the list macros like allowed earlier. They must use dcache
-   APIs like d_drop() or __d_drop() depending on the situation.
-2. d_flags is now protected by a per-dentry lock (d_lock). All
-   access to d_flags must be protected by it.
-3. For a hashed dentry, checking of d_count needs to be protected
-   by d_lock.
-Papers and other documentation on dcache locking
-================================================
-1. Scaling dcache with RCU (http://linuxjournal.com/article.php?sid=7124).
-2. http://lse.sourceforge.net/locking/dcache/dcache.html
diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt
index 4e7cc8d3359b..e52457581f47 100644
--- a/Documentation/hpet.txt
+++ b/Documentation/hpet.txt
@@ -1,18 +1,21 @@
                High Precision Event Timer Driver for Linux
-The High Precision Event Timer (HPET) hardware is the future replacement for the 8254 and Real
+The High Precision Event Timer (HPET) hardware is the future replacement
-Time Clock (RTC) periodic timer functionality.  Each HPET can have up two 32 timers.  It is possible
+for the 8254 and Real Time Clock (RTC) periodic timer functionality.
-to configure the first two timers as legacy replacements for 8254 and RTC periodic.  A specification
+Each HPET can have up two 32 timers.  It is possible to configure the
-done by INTEL and Microsoft can be found at http://www.intel.com/labs/platcomp/hpet/hpetspec.htm.
+first two timers as legacy replacements for 8254 and RTC periodic timers.
+A specification done by Intel and Microsoft can be found at
-The driver supports detection of HPET driver allocation and initialization of the HPET before the
+<http://www.intel.com/hardwaredesign/hpetspec.htm>.
-driver module_init routine is called.  This enables platform code which uses timer 0 or 1 as the
-main timer to intercept HPET initialization.  An example of this initialization can be found in
+The driver supports detection of HPET driver allocation and initialization
+of the HPET before the driver module_init routine is called.  This enables
+platform code which uses timer 0 or 1 as the main timer to intercept HPET
+initialization.  An example of this initialization can be found in
 arch/i386/kernel/time_hpet.c.
-The driver provides two APIs which are very similar to the API found in the rtc.c driver.
+The driver provides two APIs which are very similar to the API found in
-There is a user space API and a kernel space API.  An example user space program is provided
+the rtc.c driver.  There is a user space API and a kernel space API.
-below.
+An example user space program is provided below.
 #include <stdio.h>
 #include <stdlib.h>
@@ -290,9 +293,8 @@ The kernel API has three interfaces exported from the driver:
        hpet_unregister(struct hpet_task *tp)
        hpet_control(struct hpet_task *tp, unsigned int cmd, unsigned long arg)
-The kernel module using this interface fills in the ht_func and ht_data members of the
+The kernel module using this interface fills in the ht_func and ht_data
-hpet_task structure before calling hpet_register.  hpet_control simply vectors to the hpet_ioctl
+members of the hpet_task structure before calling hpet_register.
-routine and has the same commands and respective arguments as the user API.  hpet_unregister
+hpet_control simply vectors to the hpet_ioctl routine and has the same
+commands and respective arguments as the user API.  hpet_unregister
 is used to terminate usage of the HPET timer reserved by hpet_register.
diff --git a/Documentation/i2c/busses/i2c-viapro b/Documentation/i2c/busses/i2c-viapro
index 9363b8bd6109..16775663b9f5 100644
--- a/Documentation/i2c/busses/i2c-viapro
+++ b/Documentation/i2c/busses/i2c-viapro
@@ -7,12 +7,10 @@ Supported adapters:
  * VIA Technologies, Inc. VT82C686A/B
    Datasheet: Sometimes available at the VIA website
-  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237
+  * VIA Technologies, Inc. VT8231, VT8233, VT8233A, VT8235, VT8237R
-    Datasheet: available on request from Via
+    Datasheet: available on request from VIA
 Authors:
-        Frodo Looijaard <frodol@dds.nl>,
-        Philip Edelbrock <phil@netroedge.com>,
        Ky�sti M�lkki <kmalkki@cc.hut.fi>,
        Mark D. Studebaker <mdsxyz123@yahoo.com>,
        Jean Delvare <khali@linux-fr.org>
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index cff7b652588a..d19993cc0604 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -412,7 +412,7 @@ For now, you can ignore the `flags' parameter. It is there for future use.
        release_region(address,FOO_EXTENT);
    /* SENSORS ONLY END */
    ERROR1:
-      kfree(new_client);
+      kfree(data);
    ERROR0:
      return err;
  }
@@ -443,7 +443,7 @@ much simpler than the attachment code, fortunately!
      release_region(client->addr,LM78_EXTENT);
    /* HYBRID SENSORS CHIP ONLY END */
-    kfree(data);
+    kfree(i2c_get_clientdata(client));
    return 0;
  }
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt
index 769f925c8526..87f4d052e39c 100644
--- a/Documentation/ioctl-number.txt
+++ b/Documentation/ioctl-number.txt
@@ -130,8 +130,6 @@ Code	Seq#	Include File		Comments
                                        <mailto:zapman@interlan.net>
 'i'     00-3F   linux/i2o.h
 'j'     00-3F   linux/joystick.h
-'k'     all     asm-sparc/kbio.h
-                asm-sparc64/kbio.h
 'l'     00-3F   linux/tcfs_fs.h         transparent cryptographic file system
                                        <http://mikonos.dia.unisa.it/tcfs>
 'l'     40-7F   linux/udf_fs_i.h        in development:
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index bd8eefa17587..af67faccf4de 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -120,7 +120,7 @@ ISDN_NET_MAGIC        0x49344C02  isdn_net_local_s  drivers/isdn/i4l/isdn_net_li
 SAVEKMSG_MAGIC2       0x4B4D5347  savekmsg          arch/*/amiga/config.c
 STLI_BOARDMAGIC       0x4bc6c825  stlibrd           include/linux/istallion.h
 CS_STATE_MAGIC        0x4c4f4749  cs_state          sound/oss/cs46xx.c
-SLAB_C_MAGIC          0x4f17a36d  kmem_cache_s      mm/slab.c
+SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c
 COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c
 I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c
 TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c
diff --git a/Documentation/md.txt b/Documentation/md.txt
index e2b536992a27..23e6cce40f9c 100644
--- a/Documentation/md.txt
+++ b/Documentation/md.txt
@@ -116,3 +116,122 @@ and it's role in the array.
 Once started with RUN_ARRAY, uninitialized spares can be added with
 HOT_ADD_DISK.
+MD devices in sysfs
+-------------------
+md devices appear in sysfs (/sys) as regular block devices,
+e.g.
+   /sys/block/md0
+Each 'md' device will contain a subdirectory called 'md' which
+contains further md-specific information about the device.
+All md devices contain:
+  level
+     a text file indicating the 'raid level'.  This may be a standard
+     numerical level prefixed by "RAID-" - e.g. "RAID-5", or some
+     other name such as "linear" or "multipath".
+     If no raid level has been set yet (array is still being
+     assembled), this file will be empty.
+  raid_disks
+     a text file with a simple number indicating the number of devices
+     in a fully functional array.  If this is not yet known, the file
+     will be empty.  If an array is being resized (not currently
+     possible) this will contain the larger of the old and new sizes.
+As component devices are added to an md array, they appear in the 'md'
+directory as new directories named
+      dev-XXX
+where XXX is a name that the kernel knows for the device, e.g. hdb1.
+Each directory contains:
+      block
+        a symlink to the block device in /sys/block, e.g.
+             /sys/block/md0/md/dev-hdb1/block -> ../../../../block/hdb/hdb1
+      super
+        A file containing an image of the superblock read from, or
+        written to, that device.
+      state
+        A file recording the current state of the device in the array
+        which can be a comma separated list of
+              faulty   - device has been kicked from active use due to
+                         a detected fault
+              in_sync  - device is a fully in-sync member of the array
+              spare    - device is working, but not a full member.
+                         This includes spares that are in the process
+                         of being recoverred to
+        This list make grow in future.
+An active md device will also contain and entry for each active device
+in the array.  These are named
+    rdNN
+where 'NN' is the possition in the array, starting from 0.
+So for a 3 drive array there will be rd0, rd1, rd2.
+These are symbolic links to the appropriate 'dev-XXX' entry.
+Thus, for example,
+       cat /sys/block/md*/md/rd*/state
+will show 'in_sync' on every line.
+Active md devices for levels that support data redundancy (1,4,5,6)
+also have
+   sync_action
+     a text file that can be used to monitor and control the rebuild
+     process.  It contains one word which can be one of:
+       resync        - redundancy is being recalculated after unclean
+                       shutdown or creation
+       recover       - a hot spare is being built to replace a
+                       failed/missing device
+       idle          - nothing is happening
+       check         - A full check of redundancy was requested and is
+                       happening.  This reads all block and checks
+                       them. A repair may also happen for some raid
+                       levels.
+       repair        - A full check and repair is happening.  This is
+                       similar to 'resync', but was requested by the
+                       user, and the write-intent bitmap is NOT used to
+                       optimise the process.
+      This file is writable, and each of the strings that could be
+      read are meaningful for writing.
+       'idle' will stop an active resync/recovery etc.  There is no
+           guarantee that another resync/recovery may not be automatically
+           started again, though some event will be needed to trigger
+           this.
+        'resync' or 'recovery' can be used to restart the
+           corresponding operation if it was stopped with 'idle'.
+        'check' and 'repair' will start the appropriate process
+           providing the current state is 'idle'.
+   mismatch_count
+      When performing 'check' and 'repair', and possibly when
+      performing 'resync', md will count the number of errors that are
+      found.  The count in 'mismatch_cnt' is the number of sectors
+      that were re-written, or (for 'check') would have been
+      re-written.  As most raid levels work in units of pages rather
+      than sectors, this my be larger than the number of actual errors
+      by a factor of the number of sectors in a page.
+Each active md device may also have attributes specific to the
+personality module that manages it.
+These are specific to the implementation of the module and could
+change substantially if the implementation changes.
+These currently include
+  stripe_cache_size  (currently raid5 only)
+      number of entries in the stripe cache.  This is writable, but
+      there are upper and lower limits (32768, 16).  Default is 128.
+  strip_cache_active (currently raid5 only)
+      number of active entries in the stripe cache
diff --git a/Documentation/networking/README.ipw2100 b/Documentation/networking/README.ipw2100
index 2046948b020d..3ab40379d1cf 100644
--- a/Documentation/networking/README.ipw2100
+++ b/Documentation/networking/README.ipw2100
@@ -1,27 +1,82 @@
-===========================
+Intel(R) PRO/Wireless 2100 Driver for Linux in support of:
-Intel(R) PRO/Wireless 2100 Network Connection Driver for Linux
+Intel(R) PRO/Wireless 2100 Network Connection
+Copyright (C) 2003-2005, Intel Corporation
 README.ipw2100
-March 14, 2005
+Version: 1.1.3
+Date   : October 17, 2005
-===========================
 Index
---------------------------
+-----------------------------------------------
-0. Introduction
+0. IMPORTANT INFORMATION BEFORE USING THIS DRIVER
-1. Release 1.1.0 Current Features
+1. Introduction
-2. Command Line Parameters
+2. Release 1.1.3 Current Features
-3. Sysfs Helper Files
+3. Command Line Parameters
-4. Radio Kill Switch
+4. Sysfs Helper Files
-5. Dynamic Firmware
+5. Radio Kill Switch
-6. Power Management
+6. Dynamic Firmware
-7. Support
+7. Power Management
-8. License
+8. Support
+9. License
-===========================
-0. Introduction
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
------------ -----   -----       ----       ---       --         -     
+-----------------------------------------------
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!!
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure.
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+The drivers available for download from SourceForge are provided as a
+part of a development project.  Conformance to local regulatory
+requirements is the responsibility of the individual developer.  As
+such, if you are interested in deploying or shipping a driver as part of
+solution intended to be used for purposes other than development, please
+obtain a tested driver from Intel Customer Support at:
+http://support.intel.com/support/notebook/sb/CS-006408.htm
+1. Introduction
+-----------------------------------------------
 This document provides a brief overview of the features supported by the 
 IPW2100 driver project.  The main project website, where the latest 
@@ -34,9 +89,8 @@ potential fixes and patches, as well as links to the development mailing list
 for the driver project.
-===========================
+2. Release 1.1.3 Current Supported Features
-1. Release 1.1.0 Current Supported Features
+-----------------------------------------------
---------------------------     
 - Managed (BSS) and Ad-Hoc (IBSS)
 - WEP (shared key and open)
 - Wireless Tools support 
@@ -51,9 +105,8 @@ on the amount of validation and interoperability testing that has been
 performed on a given feature.
-===========================
+3. Command Line Parameters
-2. Command Line Parameters
+-----------------------------------------------
---------------------------     
 If the driver is built as a module, the following optional parameters are used
 by entering them on the command line with the modprobe command using this
@@ -75,9 +128,9 @@ associate	boolean		associate=0 /* Do NOT auto associate */
 disable         boolean         disable=1 /* Do not power the HW */
-===========================
+4. Sysfs Helper Files
-3. Sysfs Helper Files
 ---------------------------     
+-----------------------------------------------
 There are several ways to control the behavior of the driver.  Many of the 
 general capabilities are exposed through the Wireless Tools (iwconfig).  There
@@ -120,9 +173,8 @@ For the device level files, see /sys/bus/pci/drivers/ipw2100:
        based RF kill from ON -> OFF -> ON, the radio will NOT come back on
-===========================
+5. Radio Kill Switch
-4. Radio Kill Switch
+-----------------------------------------------
---------------------------
 Most laptops provide the ability for the user to physically disable the radio.
 Some vendors have implemented this as a physical switch that requires no
 software to turn the radio off and on.  On other laptops, however, the switch
@@ -134,9 +186,8 @@ See the Sysfs helper file 'rf_kill' for determining the state of the RF switch
 on your system.
-===========================
+6. Dynamic Firmware
-5. Dynamic Firmware
+-----------------------------------------------
---------------------------     
 As the firmware is licensed under a restricted use license, it can not be 
 included within the kernel sources.  To enable the IPW2100 you will need a 
 firmware image to load into the wireless NIC's processors.
@@ -146,9 +197,8 @@ You can obtain these images from <http://ipw2100.sf.net/firmware.php>.
 See INSTALL for instructions on installing the firmware.
-===========================
+7. Power Management
-6. Power Management
+-----------------------------------------------
---------------------------     
 The IPW2100 supports the configuration of the Power Save Protocol 
 through a private wireless extension interface.  The IPW2100 supports 
 the following different modes:
@@ -200,9 +250,8 @@ xxxx/yyyy will be replaced with 'off' -- the level reported will be the active
 level if `iwconfig eth1 power on` is invoked.
-===========================
+8. Support
-7. Support
+-----------------------------------------------
---------------------------     
 For general development information and support,
 go to:
@@ -218,9 +267,8 @@ For installation support on the ipw2100 1.1.0 driver on Linux kernels
    http://supportmail.intel.com
-===========================
+9. License
-8. License
+-----------------------------------------------
---------------------------     
  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
diff --git a/Documentation/networking/README.ipw2200 b/Documentation/networking/README.ipw2200
index 6916080c5f03..c6492d3839fa 100644
--- a/Documentation/networking/README.ipw2200
+++ b/Documentation/networking/README.ipw2200
@@ -1,33 +1,89 @@
 Intel(R) PRO/Wireless 2915ABG Driver for Linux in support of:
-Intel(R) PRO/Wireless 2200BG Network Connection 
+Intel(R) PRO/Wireless 2200BG Network Connection
-Intel(R) PRO/Wireless 2915ABG Network Connection 
+Intel(R) PRO/Wireless 2915ABG Network Connection
-Note: The Intel(R) PRO/Wireless 2915ABG Driver for Linux and Intel(R) 
+Note: The Intel(R) PRO/Wireless 2915ABG Driver for Linux and Intel(R)
-PRO/Wireless 2200BG Driver for Linux is a unified driver that works on 
+PRO/Wireless 2200BG Driver for Linux is a unified driver that works on
-both hardware adapters listed above. In this document the Intel(R) 
+both hardware adapters listed above. In this document the Intel(R)
-PRO/Wireless 2915ABG Driver for Linux will be used to reference the 
+PRO/Wireless 2915ABG Driver for Linux will be used to reference the
 unified driver.
 Copyright (C) 2004-2005, Intel Corporation
 README.ipw2200
-Version: 1.0.0
+Version: 1.0.8
-Date   : January 31, 2005
+Date   : October 20, 2005
 Index
 -----------------------------------------------
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
 1.   Introduction
 1.1. Overview of features
 1.2. Module parameters
 1.3. Wireless Extension Private Methods
 1.4. Sysfs Helper Files
-2.   About the Version Numbers
+2.   Ad-Hoc Networking
-3.   Support
+3.   Interacting with Wireless Tools
-4.   License
+3.1. iwconfig mode
+4.   About the Version Numbers
+5.   Firmware installation
+6.   Support
+7.   License
+0.   IMPORTANT INFORMATION BEFORE USING THIS DRIVER
+-----------------------------------------------
+Important Notice FOR ALL USERS OR DISTRIBUTORS!!!! 
+Intel wireless LAN adapters are engineered, manufactured, tested, and
+quality checked to ensure that they meet all necessary local and
+governmental regulatory agency requirements for the regions that they
+are designated and/or marked to ship into. Since wireless LANs are
+generally unlicensed devices that share spectrum with radars,
+satellites, and other licensed and unlicensed devices, it is sometimes
+necessary to dynamically detect, avoid, and limit usage to avoid
+interference with these devices. In many instances Intel is required to
+provide test data to prove regional and local compliance to regional and
+governmental regulations before certification or approval to use the
+product is granted. Intel's wireless LAN's EEPROM, firmware, and
+software driver are designed to carefully control parameters that affect
+radio operation and to ensure electromagnetic compliance (EMC). These
+parameters include, without limitation, RF power, spectrum usage,
+channel scanning, and human exposure. 
+For these reasons Intel cannot permit any manipulation by third parties
+of the software provided in binary format with the wireless WLAN
+adapters (e.g., the EEPROM and firmware). Furthermore, if you use any
+patches, utilities, or code with the Intel wireless LAN adapters that
+have been manipulated by an unauthorized party (i.e., patches,
+utilities, or code (including open source code modifications) which have
+not been validated by Intel), (i) you will be solely responsible for
+ensuring the regulatory compliance of the products, (ii) Intel will bear
+no liability, under any theory of liability for any issues associated
+with the modified products, including without limitation, claims under
+the warranty and/or issues arising from regulatory non-compliance, and
+(iii) Intel will not provide or be required to assist in providing
+support to any third parties for such modified products.  
+Note: Many regulatory agencies consider Wireless LAN adapters to be
+modules, and accordingly, condition system-level regulatory approval
+upon receipt and review of test data documenting that the antennas and
+system configuration do not cause the EMC and radio operation to be
+non-compliant.
+The drivers available for download from SourceForge are provided as a 
+part of a development project.  Conformance to local regulatory 
+requirements is the responsibility of the individual developer.  As 
+such, if you are interested in deploying or shipping a driver as part of 
+solution intended to be used for purposes other than development, please 
+obtain a tested driver from Intel Customer Support at:
+http://support.intel.com/support/notebook/sb/CS-006408.htm
 1.   Introduction
@@ -45,7 +101,7 @@ file.
 1.1. Overview of Features
 -----------------------------------------------
-The current release (1.0.0) supports the following features:
+The current release (1.0.8) supports the following features:
 + BSS mode (Infrastructure, Managed)
 + IBSS mode (Ad-Hoc)
@@ -56,17 +112,27 @@ The current release (1.0.0) supports the following features:
 + Full A rate support (2915 only)
 + Transmit power control
 + S state support (ACPI suspend/resume)
+The following features are currently enabled, but not officially
+supported:
+ WPA
 + long/short preamble support
+ Monitor mode (aka RFMon)
+The distinction between officially supported and enabled is a reflection 
+on the amount of validation and interoperability testing that has been
+performed on a given feature. 
 1.2. Command Line Parameters
 -----------------------------------------------
-Like many modules used in the Linux kernel, the Intel(R) PRO/Wireless 
+Like many modules used in the Linux kernel, the Intel(R) PRO/Wireless
-2915ABG Driver for Linux allows certain configuration options to be 
+2915ABG Driver for Linux allows configuration options to be provided 
-provided as module parameters.  The most common way to specify a module 
+as module parameters.  The most common way to specify a module parameter 
-parameter is via the command line.  
+is via the command line.  
 The general form is:
@@ -96,14 +162,18 @@ Where the supported parameter are:
  debug
        If using a debug build, this is used to control the amount of debug
-        info is logged.  See the 'dval' and 'load' script for more info on
+        info is logged.  See the 'dvals' and 'load' script for more info on
-        how to use this (the dval and load scripts are provided as part 
+        how to use this (the dvals and load scripts are provided as part 
        of the ipw2200 development snapshot releases available from the 
        SourceForge project at http://ipw2200.sf.net)
+  
+  led
+        Can be used to turn on experimental LED code.
+        0 = Off, 1 = On.  Default is 0.
  mode
        Can be used to set the default mode of the adapter.  
-        0 = Managed, 1 = Ad-Hoc
+        0 = Managed, 1 = Ad-Hoc, 2 = Monitor
 1.3. Wireless Extension Private Methods
@@ -164,8 +234,8 @@ The supported private methods are:
 -----------------------------------------------
 The Linux kernel provides a pseudo file system that can be used to 
-access various components of the operating system.  The Intel(R) 
+access various components of the operating system.  The Intel(R)
-PRO/Wireless 2915ABG Driver for Linux exposes several configuration 
+PRO/Wireless 2915ABG Driver for Linux exposes several configuration
 parameters through this mechanism.
 An entry in the sysfs can support reading and/or writing.  You can 
@@ -184,13 +254,13 @@ You can set the debug level via:
 Where $VALUE would be a number in the case of this sysfs entry.  The 
 input to sysfs files does not have to be a number.  For example, the 
-firmware loader used by hotplug utilizes sysfs entries for transferring 
+firmware loader used by hotplug utilizes sysfs entries for transfering 
 the firmware image from user space into the driver.
 The Intel(R) PRO/Wireless 2915ABG Driver for Linux exposes sysfs entries 
-at two levels -- driver level, which apply to all instances of the 
+at two levels -- driver level, which apply to all instances of the driver 
-driver (in the event that there are more than one device installed) and 
+(in the event that there are more than one device installed) and device 
-device level, which applies only to the single specific instance.
+level, which applies only to the single specific instance.
 1.4.1 Driver Level Sysfs Helper Files
@@ -203,6 +273,7 @@ For the driver level files, look in /sys/bus/pci/drivers/ipw2200/
        This controls the same global as the 'debug' module parameter
 1.4.2 Device Level Sysfs Helper Files
 -----------------------------------------------
@@ -213,7 +284,7 @@ For the device level files, look in
 For example:
        /sys/bus/pci/drivers/ipw2200/0000:02:01.0
-For the device level files, see /sys/bus/pci/[drivers/ipw2200:
+For the device level files, see /sys/bus/pci/drivers/ipw2200:
  rf_kill
        read - 
@@ -231,8 +302,59 @@ For the device level files, see /sys/bus/pci/[drivers/ipw2200:
  ucode 
        read-only access to the ucode version number
+  led
+        read -
+        0 = LED code disabled
+        1 = LED code enabled
+        write -
+        0 = Disable LED code
+        1 = Enable LED code
+        NOTE: The LED code has been reported to hang some systems when 
+        running ifconfig and is therefore disabled by default.
+2.   Ad-Hoc Networking
+-----------------------------------------------
+When using a device in an Ad-Hoc network, it is useful to understand the 
+sequence and requirements for the driver to be able to create, join, or 
+merge networks.
+The following attempts to provide enough information so that you can 
+have a consistent experience while using the driver as a member of an 
+Ad-Hoc network.
+2.1. Joining an Ad-Hoc Network
+-----------------------------------------------
+The easiest way to get onto an Ad-Hoc network is to join one that 
+already exists.
-2.   About the Version Numbers
+2.2. Creating an Ad-Hoc Network
+-----------------------------------------------
+An Ad-Hoc networks is created using the syntax of the Wireless tool.
+For Example:
+iwconfig eth1 mode ad-hoc essid testing channel 2
+2.3. Merging Ad-Hoc Networks
+-----------------------------------------------
+3.  Interaction with Wireless Tools
+-----------------------------------------------
+3.1 iwconfig mode
+-----------------------------------------------
+When configuring the mode of the adapter, all run-time configured parameters
+are reset to the value used when the module was loaded.  This includes
+channels, rates, ESSID, etc.
+4.   About the Version Numbers
 -----------------------------------------------
 Due to the nature of open source development projects, there are 
@@ -259,12 +381,23 @@ available as quickly as possible, unknown anomalies should be expected.
 The major version number will be incremented when significant changes
 are made to the driver.  Currently, there are no major changes planned.
+5.  Firmware installation
+----------------------------------------------
+The driver requires a firmware image, download it and extract the
+files under /lib/firmware (or wherever your hotplug's firmware.agent
+will look for firmware files)
+The firmware can be downloaded from the following URL:
-3.  Support
+    http://ipw2200.sf.net/
+6.  Support
 -----------------------------------------------
-For installation support of the 1.0.0 version, you can contact 
+For direct support of the 1.0.0 version, you can contact 
-http://supportmail.intel.com, or you can use the open source project 
+http://supportmail.intel.com, or you can use the open source project
 support.
 For general information and support, go to:
@@ -272,7 +405,7 @@ For general information and support, go to:
    http://ipw2200.sf.net/
-4.  License
+7.  License
 -----------------------------------------------
  Copyright(c) 2003 - 2005 Intel Corporation. All rights reserved.
@@ -297,4 +430,3 @@ For general information and support, go to:
  James P. Ketrenos <ipw2100-admin@linux.intel.com>
  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
diff --git a/Documentation/networking/dccp.txt b/Documentation/networking/dccp.txt
new file mode 100644
index 000000000000..c45daabd3bfe
--- /dev/null
+++ b/Documentation/networking/dccp.txt
@@ -0,0 +1,56 @@
+DCCP protocol
+============
+Last updated: 10 November 2005
+Contents
+========
+- Introduction
+- Missing features
+- Socket options
+- Notes
+Introduction
+============
+Datagram Congestion Control Protocol (DCCP) is an unreliable, connection
+based protocol designed to solve issues present in UDP and TCP particularly
+for real time and multimedia traffic.
+It has a base protocol and pluggable congestion control IDs (CCIDs).
+It is at draft RFC status and the homepage for DCCP as a protocol is at:
+        http://www.icir.org/kohler/dcp/
+Missing features
+================
+The DCCP implementation does not currently have all the features that are in
+the draft RFC.
+In particular the following are missing:
+- CCID2 support
+- feature negotiation
+When testing against other implementations it appears that elapsed time
+options are not coded compliant to the specification.
+Socket options
+==============
+DCCP_SOCKOPT_PACKET_SIZE is used for CCID3 to set default packet size for
+calculations.
+DCCP_SOCKOPT_SERVICE sets the service. This is compulsory as per the
+specification. If you don't set it you will get EPROTO.
+Notes
+=====
+SELinux does not yet have support for DCCP. You will need to turn it off or
+else you will get EACCES.
+DCCP does not travel through NAT successfully at present. This is because
+the checksum covers the psuedo-header as per TCP and UDP. It should be
+relatively trivial to add Linux NAT support for DCCP.
diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index c6bd25f5d61d..e6c39c5831f5 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -176,8 +176,6 @@ information (_most_ of which _is_ _essential_) includes:
 - Which client caused the problem ?
 - How much data was being transferred ?
 - Was the network congested ?
- - If there was a kernel panic, please run the output through ksymoops
-   before sending it to me, otherwise its _useless_.
 - How can the problem be reproduced ?
 - Can you use tcpdump to get a trace ? (N.B. Most (all?) versions of 
   tcpdump don't understand how to dump DECnet properly, so including
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 65895bb51414..ebc09a159f62 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -78,6 +78,11 @@ inet_peer_gc_maxtime - INTEGER
 TCP variables: 
+tcp_abc - INTEGER
+        Controls Appropriate Byte Count defined in RFC3465. If set to
+        0 then does congestion avoid once per ack. 1 is conservative
+        value, and 2 is more agressive.
 tcp_syn_retries - INTEGER
        Number of times initial SYNs for an active TCP connection attempt
        will be retransmitted. Should not be higher than 255. Default value
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index 6726b524ec45..bd528ffbeb4b 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -1,48 +1,153 @@
-S2IO Technologies XFrame 10 Gig adapter.
+Release notes for Neterion's (Formerly S2io) Xframe I/II PCI-X 10GbE driver.
-------------------------------------------
+Contents
-I. Module loadable parameters.
+=======
-When loaded as a module, the driver provides a host of Module loadable
+- 1.  Introduction
-parameters, so the device can be tuned as per the users needs.
+- 2.  Identifying the adapter/interface
-A list of the Module params is given below.
+- 3.  Features supported
-(i)     ring_num: This can be used to program the number of
+- 4.  Command line parameters
-                 receive rings used in the driver.
+- 5.  Performance suggestions
-(ii)    ring_len: This defines the number of descriptors each ring
+- 6.  Available Downloads 
-                 can have. There can be a maximum of 8 rings.
-(iii)   frame_len: This is an array of size 8. Using this we can 
-                 set the maximum size of the received frame that can
+1.      Introduction:
-                 be steered into the corrsponding receive ring. 
+This Linux driver supports Neterion's Xframe I PCI-X 1.0 and
-(iv)    fifo_num: This defines the number of Tx FIFOs thats used in
+Xframe II PCI-X 2.0 adapters. It supports several features 
-                 the driver. 
+such as jumbo frames, MSI/MSI-X, checksum offloads, TSO, UFO and so on.
-(v)     fifo_len: Each element defines the number of 
+See below for complete list of features.
-                 Tx descriptors that can be associated with each 
+All features are supported for both IPv4 and IPv6.
-                 corresponding FIFO. There are a maximum of 8 FIFOs.
-(vi)    tx_prio: This is a bool, if module is loaded with a non-zero
+2.      Identifying the adapter/interface:
-                value for tx_prio multi FIFO scheme is activated.
+a. Insert the adapter(s) in your system.
-(vii)   rx_prio: This is a bool, if module is loaded with a non-zero
+b. Build and load driver 
-                value for tx_prio multi RING scheme is activated.
+# insmod s2io.ko
-(viii)  latency_timer: The value given against this param will be
+c. View log messages
-                 loaded into the latency timer register in PCI Config
+# dmesg | tail -40
-                 space, else the register is left with its reset value.
+You will see messages similar to:
+eth3: Neterion Xframe I 10GbE adapter (rev 3), Version 2.0.9.1, Intr type INTA
-II. Performance tuning.
+eth4: Neterion Xframe II 10GbE adapter (rev 2), Version 2.0.9.1, Intr type INTA
- By changing a few sysctl parameters.
+eth4: Device is on 64 bit 133MHz PCIX(M1) bus
-        Copy the following lines into a file and run the following command,
-        "sysctl -p <file_name>"
+The above messages identify the adapter type(Xframe I/II), adapter revision,
-### IPV4 specific settings
+driver version, interface name(eth3, eth4), Interrupt type(INTA, MSI, MSI-X).
-net.ipv4.tcp_timestamps = 0 # turns TCP timestamp support off, default 1, reduces CPU use
+In case of Xframe II, the PCI/PCI-X bus width and frequency are displayed
-net.ipv4.tcp_sack = 0 # turn SACK support off, default on
+as well.
-# on systems with a VERY fast bus -> memory interface this is the big gainer
-net.ipv4.tcp_rmem = 10000000 10000000 10000000 # sets min/default/max TCP read buffer, default 4096 87380 174760
+To associate an interface with a physical adapter use "ethtool -p <ethX>".
-net.ipv4.tcp_wmem = 10000000 10000000 10000000 # sets min/pressure/max TCP write buffer, default 4096 16384 131072
+The corresponding adapter's LED will blink multiple times.
-net.ipv4.tcp_mem = 10000000 10000000 10000000 # sets min/pressure/max TCP buffer space, default 31744 32256 32768
-                                                                                
+3.      Features supported:
-### CORE settings (mostly for socket and UDP effect)
+a. Jumbo frames. Xframe I/II supports MTU upto 9600 bytes,
-net.core.rmem_max = 524287 # maximum receive socket buffer size, default 131071
+modifiable using ifconfig command.
-net.core.wmem_max = 524287 # maximum send socket buffer size, default 131071
-net.core.rmem_default = 524287 # default receive socket buffer size, default 65535
+b. Offloads. Supports checksum offload(TCP/UDP/IP) on transmit
-net.core.wmem_default = 524287 # default send socket buffer size, default 65535
+and receive, TSO.
-net.core.optmem_max = 524287 # maximum amount of option memory buffers, default 10240
-net.core.netdev_max_backlog = 300000 # number of unprocessed input packets before kernel starts dropping them, default 300
+c. Multi-buffer receive mode. Scattering of packet across multiple
---End of performance tuning file---
+buffers. Currently driver supports 2-buffer mode which yields
+significant performance improvement on certain platforms(SGI Altix,
+IBM xSeries).
+d. MSI/MSI-X. Can be enabled on platforms which support this feature
+(IA64, Xeon) resulting in noticeable performance improvement(upto 7%
+on certain platforms).
+e. NAPI. Compile-time option(CONFIG_S2IO_NAPI) for better Rx interrupt 
+moderation.
+f. Statistics. Comprehensive MAC-level and software statistics displayed
+using "ethtool -S" option.
+g. Multi-FIFO/Ring. Supports up to 8 transmit queues and receive rings, 
+with multiple steering options.
+4.  Command line parameters
+a. tx_fifo_num
+Number of transmit queues
+Valid range: 1-8
+Default: 1
+b. rx_ring_num
+Number of receive rings
+Valid range: 1-8
+Default: 1
+c. tx_fifo_len
+Size of each transmit queue
+Valid range: Total length of all queues should not exceed 8192
+Default: 4096
+d. rx_ring_sz 
+Size of each receive ring(in 4K blocks)
+Valid range: Limited by memory on system
+Default: 30 
+e. intr_type
+Specifies interrupt type. Possible values 1(INTA), 2(MSI), 3(MSI-X)
+Valid range: 1-3
+Default: 1 
+5.  Performance suggestions
+General:
+a. Set MTU to maximum(9000 for switch setup, 9600 in back-to-back configuration)
+b. Set TCP windows size to optimal value. 
+For instance, for MTU=1500 a value of 210K has been observed to result in 
+good performance.
+# sysctl -w net.ipv4.tcp_rmem="210000 210000 210000"
+# sysctl -w net.ipv4.tcp_wmem="210000 210000 210000"
+For MTU=9000, TCP window size of 10 MB is recommended.
+# sysctl -w net.ipv4.tcp_rmem="10000000 10000000 10000000"
+# sysctl -w net.ipv4.tcp_wmem="10000000 10000000 10000000"
+Transmit performance:
+a. By default, the driver respects BIOS settings for PCI bus parameters. 
+However, you may want to experiment with PCI bus parameters 
+max-split-transactions(MOST) and MMRBC (use setpci command). 
+A MOST value of 2 has been found optimal for Opterons and 3 for Itanium.  
+It could be different for your hardware.  
+Set MMRBC to 4K**.
+For example you can set 
+For opteron
+#setpci -d 17d5:* 62=1d 
+For Itanium
+#setpci -d 17d5:* 62=3d 
+For detailed description of the PCI registers, please see Xframe User Guide.
+b. Ensure Transmit Checksum offload is enabled. Use ethtool to set/verify this 
+parameter.
+c. Turn on TSO(using "ethtool -K")
+# ethtool -K <ethX> tso on
+Receive performance:
+a. By default, the driver respects BIOS settings for PCI bus parameters. 
+However, you may want to set PCI latency timer to 248.
+#setpci -d 17d5:* LATENCY_TIMER=f8
+For detailed description of the PCI registers, please see Xframe User Guide.
+b. Use 2-buffer mode. This results in large performance boost on
+on certain platforms(eg. SGI Altix, IBM xSeries).
+c. Ensure Receive Checksum offload is enabled. Use "ethtool -K ethX" command to 
+set/verify this option.
+d. Enable NAPI feature(in kernel configuration Device Drivers ---> Network 
+device support --->  Ethernet (10000 Mbit) ---> S2IO 10Gbe Xframe NIC) to 
+bring down CPU utilization.
+** For AMD opteron platforms with 8131 chipset, MMRBC=1 and MOST=1 are 
+recommended as safe parameters.
+For more information, please review the AMD8131 errata at
+http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/26310.pdf
+6.  Available Downloads
+Neterion "s2io" driver in Red Hat and Suse 2.6-based distributions is kept up 
+to date, also the latest "s2io" code (including support for 2.4 kernels) is 
+available via "Support" link on the Neterion site:  http://www.neterion.com.
+For Xframe User Guide (Programming manual), visit ftp site ns1.s2io.com,
+user: linuxdocs password: HALdocs
+7. Support 
+For further support please contact either your 10GbE Xframe NIC vendor (IBM, 
+HP, SGI etc.) or click on the "Support" link on the Neterion site:  
+http://www.neterion.com.
diff --git a/Documentation/oops-tracing.txt b/Documentation/oops-tracing.txt
index 66eaaab7773d..9f30ac6ca47b 100644
--- a/Documentation/oops-tracing.txt
+++ b/Documentation/oops-tracing.txt
@@ -1,6 +1,6 @@
 NOTE: ksymoops is useless on 2.6.  Please use the Oops in its original format
 (from dmesg, etc).  Ignore any references in this or other docs to "decoding
-the Oops" or "running it through ksymoops".  If you post an Oops fron 2.6 that
+the Oops" or "running it through ksymoops".  If you post an Oops from 2.6 that
 has been run through ksymoops, people will just tell you to repost it.
 Quick Summary
@@ -30,7 +30,9 @@ the disk is not available then you have three options :-
 (1) Hand copy the text from the screen and type it in after the machine
    has restarted.  Messy but it is the only option if you have not
-    planned for a crash.
+    planned for a crash. Alternatively, you can take a picture of
+    the screen with a digital camera - not nice, but better than
+    nothing.
 (2) Boot with a serial console (see Documentation/serial-console.txt),
    run a null modem to a second machine and capture the output there
diff --git a/Documentation/power/video.txt b/Documentation/power/video.txt
index 526d6dd267ea..912bed87c758 100644
--- a/Documentation/power/video.txt
+++ b/Documentation/power/video.txt
@@ -11,9 +11,9 @@ boot video card. (Kernel usually does not even contain video card
 driver -- vesafb and vgacon are widely used).
 This is not problem for swsusp, because during swsusp resume, BIOS is
-run normally so video card is normally initialized. S3 has absolutely
+run normally so video card is normally initialized. It should not be
-no chance of working with SMP/HT. Be sure it to turn it off before
+problem for S1 standby, because hardware should retain its state over
-testing (swsusp should work ok, OTOH).
+that.
 There are a few types of systems where video works after S3 resume:
@@ -64,7 +64,7 @@ your video card (good luck getting docs :-(). Maybe suspending from X
 (proper X, knowing your hardware, not XF68_FBcon) might have better
 chance of working.
-Table of known working systems:
+Table of known working notebooks:
 Model                           hack (or "how to do it")
 ------------------------------------------------------------------------------
@@ -73,7 +73,7 @@ Acer TM 242FX			vbetool (6)
 Acer TM C110                    video_post (8)
 Acer TM C300                    vga=normal (only suspend on console, not in X), vbetool (6) or video_post (8)
 Acer TM 4052LCi                 s3_bios (2)
-Acer TM 636Lci                  s3_bios vga=normal (2)
+Acer TM 636Lci                  s3_bios,s3_mode (4)
 Acer TM 650 (Radeon M7)         vga=normal plus boot-radeon (5) gets text console back
 Acer TM 660                     ??? (*)
 Acer TM 800                     vga=normal, X patches, see webpage (5) or vbetool (6)
@@ -137,6 +137,13 @@ Toshiba Satellite P10-554       s3_bios,s3_mode (4)(****)
 Toshiba M30                     (2) xor X with nvidia driver using internal AGP
 Uniwill 244IIO                  ??? (*)
+Known working desktop systems
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Mainboard           Graphics card                 hack (or "how to do it")
+------------------------------------------------------------------------------
+Asus A7V8X          nVidia RIVA TNT2 model 64     s3_bios,s3_mode (4)
 (*) from http://www.ubuntulinux.org/wiki/HoaryPMResults, not sure
    which options to use. If you know, please tell me.
diff --git a/Documentation/s390/Debugging390.txt b/Documentation/s390/Debugging390.txt
index adbfe620c061..844c03fe7921 100644
--- a/Documentation/s390/Debugging390.txt
+++ b/Documentation/s390/Debugging390.txt
@@ -871,7 +871,7 @@ by playing with the --adjust-vma parameter to objdump.
-extern inline void spin_lock(spinlock_t *lp)
+static inline void spin_lock(spinlock_t *lp)
 {
      a0:       18 34           lr      %r3,%r4
      a2:       a7 3a 03 bc     ahi     %r3,956
diff --git a/Documentation/s390/driver-model.txt b/Documentation/s390/driver-model.txt
index 19461958e2bd..df09758bf3fe 100644
--- a/Documentation/s390/driver-model.txt
+++ b/Documentation/s390/driver-model.txt
@@ -8,11 +8,10 @@ All devices which can be addressed by means of ccws are called 'CCW devices' -
 even if they aren't actually driven by ccws.
 All ccw devices are accessed via a subchannel, this is reflected in the 
-structures under root/:
+structures under devices/:
-root/
+devices/
-     - sys
+     - system/
-     - legacy
     - css0/
           - 0.0.0000/0.0.0815/
           - 0.0.0001/0.0.4711/
@@ -36,7 +35,7 @@ availability: Can be 'good' or 'boxed'; 'no path' or 'no device' for
 online:     An interface to set the device online and offline.
            In the special case of the device being disconnected (see the
-            notify function under 1.2), piping 0 to online will focibly delete
+            notify function under 1.2), piping 0 to online will forcibly delete
            the device.
 The device drivers can add entries to export per-device data and interfaces.
@@ -222,7 +221,7 @@ and are called 'chp0.<chpid>'. They have no driver and do not belong to any bus.
 Please note, that unlike /proc/chpids in 2.4, the channel path objects reflect
 only the logical state and not the physical state, since we cannot track the
 latter consistently due to lacking machine support (we don't need to be aware
-of anyway).
+of it anyway).
 status - Can be 'online' or 'offline'.
         Piping 'on' or 'off' sets the chpid logically online/offline.
@@ -235,12 +234,16 @@ status - Can be 'online' or 'offline'.
 3. System devices
 -----------------
-Note: cpus may yet be added here.
 3.1 xpram 
 ---------
-xpram shows up under sys/ as 'xpram'.
+xpram shows up under devices/system/ as 'xpram'.
+3.2 cpus
+--------
+For each cpu, a directory is created under devices/system/cpu/. Each cpu has an
+attribute 'online' which can be 0 or 1.
 4. Other devices
diff --git a/Documentation/sched-arch.txt b/Documentation/sched-arch.txt
new file mode 100644
index 000000000000..941615a9769b
--- /dev/null
+++ b/Documentation/sched-arch.txt
@@ -0,0 +1,89 @@
+        CPU Scheduler implementation hints for architecture specific code
+        Nick Piggin, 2005
+Context switch
+==============
+1. Runqueue locking
+By default, the switch_to arch function is called with the runqueue
+locked. This is usually not a problem unless switch_to may need to
+take the runqueue lock. This is usually due to a wake up operation in
+the context switch. See include/asm-ia64/system.h for an example.
+To request the scheduler call switch_to with the runqueue unlocked,
+you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file
+(typically the one where switch_to is defined).
+Unlocked context switches introduce only a very minor performance
+penalty to the core scheduler implementation in the CONFIG_SMP case.
+2. Interrupt status
+By default, the switch_to arch function is called with interrupts
+disabled. Interrupts may be enabled over the call if it is likely to
+introduce a significant interrupt latency by adding the line
+`#define __ARCH_WANT_INTERRUPTS_ON_CTXSW` in the same place as for
+unlocked context switches. This define also implies
+`__ARCH_WANT_UNLOCKED_CTXSW`. See include/asm-arm/system.h for an
+example.
+CPU idle
+========
+Your cpu_idle routines need to obey the following rules:
+1. Preempt should now disabled over idle routines. Should only
+   be enabled to call schedule() then disabled again.
+2. need_resched/TIF_NEED_RESCHED is only ever set, and will never
+   be cleared until the running task has called schedule(). Idle
+   threads need only ever query need_resched, and may never set or
+   clear it.
+3. When cpu_idle finds (need_resched() == 'true'), it should call
+   schedule(). It should not call schedule() otherwise.
+4. The only time interrupts need to be disabled when checking
+   need_resched is if we are about to sleep the processor until
+   the next interrupt (this doesn't provide any protection of
+   need_resched, it prevents losing an interrupt).
+        4a. Common problem with this type of sleep appears to be:
+                local_irq_disable();
+                if (!need_resched()) {
+                        local_irq_enable();
+                        *** resched interrupt arrives here ***
+                        __asm__("sleep until next interrupt");
+                }
+5. TIF_POLLING_NRFLAG can be set by idle routines that do not
+   need an interrupt to wake them up when need_resched goes high.
+   In other words, they must be periodically polling need_resched,
+   although it may be reasonable to do some background work or enter
+   a low CPU priority.
+        5a. If TIF_POLLING_NRFLAG is set, and we do decide to enter
+            an interrupt sleep, it needs to be cleared then a memory
+            barrier issued (followed by a test of need_resched with
+            interrupts disabled, as explained in 3).
+arch/i386/kernel/process.c has examples of both polling and
+sleeping idle functions.
+Possible arch/ problems
+=======================
+Possible arch problems I found (and either tried to fix or didn't):
+h8300 - Is such sleeping racy vs interrupts? (See #4a).
+        The H8/300 manual I found indicates yes, however disabling IRQs
+        over the sleep mean only NMIs can wake it up, so can't fix easily
+        without doing spin waiting.
+ia64 - is safe_halt call racy vs interrupts? (does it sleep?) (See #4a)
+sh64 - Is sleeping racy vs interrupts? (See #4a)
+sparc - IRQs on at this point(?), change local_irq_save to _disable.
+      - TODO: needs secondary CPUs to disable preempt (See #1)
diff --git a/Documentation/scsi/00-INDEX b/Documentation/scsi/00-INDEX
index fef92ebf266f..e7da8c3a255b 100644
--- a/Documentation/scsi/00-INDEX
+++ b/Documentation/scsi/00-INDEX
@@ -52,8 +52,6 @@ ppa.txt
        - info on driver for IOmega zip drive
 qlogicfas.txt
        - info on driver for QLogic FASxxx based adapters
-qlogicisp.txt
-        - info on driver for QLogic ISP 1020 based adapters
 scsi-generic.txt
        - info on the sg driver for generic (non-disk/CD/tape) SCSI devices.
 scsi.txt
diff --git a/Documentation/scsi/LICENSE.qla2xxx b/Documentation/scsi/LICENSE.qla2xxx
new file mode 100644
index 000000000000..9e15b4f9cd28
--- /dev/null
+++ b/Documentation/scsi/LICENSE.qla2xxx
@@ -0,0 +1,45 @@
+Copyright (c)  2003-2005 QLogic Corporation
+QLogic Linux Fibre Channel HBA Driver
+This program includes a device driver for Linux 2.6 that may be
+distributed with QLogic hardware specific firmware binary file.
+You may modify and redistribute the device driver code under the
+GNU General Public License as published by the Free Software
+Foundation (version 2 or a later version).
+You may redistribute the hardware specific firmware binary file
+under the following terms:
+        1. Redistribution of source code (only if applicable),
+           must retain the above copyright notice, this list of
+           conditions and the following disclaimer.
+        2. Redistribution in binary form must reproduce the above
+           copyright notice, this list of conditions and the
+           following disclaimer in the documentation and/or other
+           materials provided with the distribution.
+        3. The name of QLogic Corporation may not be used to
+           endorse or promote products derived from this software
+           without specific prior written permission
+REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,
+THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT
+CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR
+OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,
+TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN
+ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN
+COMBINATION WITH THIS PROGRAM.
diff --git a/Documentation/scsi/qlogicfas.txt b/Documentation/scsi/qlogicfas.txt
index 398f99168077..c211d827fef2 100644
--- a/Documentation/scsi/qlogicfas.txt
+++ b/Documentation/scsi/qlogicfas.txt
@@ -11,8 +11,7 @@ Qlogic boards:
        * IQ-PCI-10
        * IQ-PCI-D
-is provided by the qlogicisp.c driver.  Check README.qlogicisp for
+is provided by the qla1280 driver.
-details.
 Nor does it support the PCI-Basic, which is supported by the
 'am53c974' driver.
diff --git a/Documentation/scsi/qlogicisp.txt b/Documentation/scsi/qlogicisp.txt
deleted file mode 100644
index 6920f6c76a9f..000000000000
--- a/Documentation/scsi/qlogicisp.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Notes for the QLogic ISP1020 PCI SCSI Driver:
-This driver works well in practice, but does not support disconnect/
-reconnect, which makes using it with tape drives impractical.
-It should work for most host adaptors with the ISP1020 chip.  The
-QLogic Corporation produces several PCI SCSI adapters which should
-work:
-        * IQ-PCI
-        * IQ-PCI-10
-        * IQ-PCI-D
-This driver may work with boards containing the ISP1020A or ISP1040A
-chips, but that has not been tested.
-This driver will NOT work with:
-        * ISA or VL Bus Qlogic cards (they use the 'qlogicfas' driver)
-        * PCI-basic (it uses the 'am53c974' driver)
-Much thanks to QLogic's tech support for providing the latest ISP1020
-firmware, and for taking the time to review my code.
-Erik Moe
-ehm@cris.com
-Revised:
-Michael A. Griffith
-grif@cs.ucr.edu
diff --git a/Documentation/scsi/scsi_eh.txt b/Documentation/scsi/scsi_eh.txt
index 534a50922a7b..331afd791cbb 100644
--- a/Documentation/scsi/scsi_eh.txt
+++ b/Documentation/scsi/scsi_eh.txt
@@ -83,11 +83,11 @@ with the command.
 The timeout handler is scsi_times_out().  When a timeout occurs, this
 function
- 1. invokes optional hostt->eh_timedout() callback.  Return value can
+ 1. invokes optional hostt->eh_timed_out() callback.  Return value can
    be one of
    - EH_HANDLED
-        This indicates that eh_timedout() dealt with the timeout.  The
+        This indicates that eh_timed_out() dealt with the timeout.  The
        scmd is passed to __scsi_done() and thus linked into per-cpu
        scsi_done_q.  Normal command completion described in [1-2-1]
        follows.
@@ -105,7 +105,7 @@ function
        command will time out again.
    - EH_NOT_HANDLED
-        This is the same as when eh_timedout() callback doesn't exist.
+        This is the same as when eh_timed_out() callback doesn't exist.
        Step #2 is taken.
 2. scsi_eh_scmd_add(scmd, SCSI_EH_CANCEL_CMD) is invoked for the
@@ -142,7 +142,7 @@ are linked on shost->eh_cmd_q.
 Note that this does not mean lower layers are quiescent.  If a LLDD
 completed a scmd with error status, the LLDD and lower layers are
 assumed to forget about the scmd at that point.  However, if a scmd
-has timed out, unless hostt->eh_timedout() made lower layers forget
+has timed out, unless hostt->eh_timed_out() made lower layers forget
 about the scmd, which currently no LLDD does, the command is still
 active as long as lower layers are concerned and completion could
 occur at any time.  Of course, all such completions are ignored as the
diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt
index 44df89c9c049..66565d42288f 100644
--- a/Documentation/scsi/scsi_mid_low_api.txt
+++ b/Documentation/scsi/scsi_mid_low_api.txt
@@ -346,7 +346,7 @@ Next, there is a movement to "outlaw" typedefs introducing synonyms for
 struct tags. Both can be still found in the SCSI subsystem, but
 the typedefs have been moved to a single file, scsi_typedefs.h to
 make their future removal easier, for example: 
-"typedef struct scsi_host_template Scsi_Host_Template;"
+"typedef struct scsi_cmnd Scsi_Cmnd;"
 Also, most C99 enhancements are encouraged to the extent they are supported
 by the relevant gcc compilers. So C99 style structure and array
@@ -718,7 +718,7 @@ void scsi_report_bus_reset(struct Scsi_Host * shost, int channel)
 *
 *      Defined in: drivers/scsi/scsi.c .
 **/
-int scsi_track_queue_full(Scsi_Device *sdev, int depth)
+int scsi_track_queue_full(struct scsi_device *sdev, int depth)
 /**
diff --git a/Documentation/sharedsubtree.txt b/Documentation/sharedsubtree.txt
new file mode 100644
index 000000000000..2d8f403eb6eb
--- /dev/null
+++ b/Documentation/sharedsubtree.txt
@@ -0,0 +1,1060 @@
+Shared Subtrees
+---------------
+Contents:
+        1) Overview
+        2) Features
+        3) smount command
+        4) Use-case
+        5) Detailed semantics
+        6) Quiz
+        7) FAQ
+        8) Implementation
+1) Overview
+-----------
+Consider the following situation:
+A process wants to clone its own namespace, but still wants to access the CD
+that got mounted recently.  Shared subtree semantics provide the necessary
+mechanism to accomplish the above.
+It provides the necessary building blocks for features like per-user-namespace
+and versioned filesystem.
+2) Features
+-----------
+Shared subtree provides four different flavors of mounts; struct vfsmount to be
+precise
+        a. shared mount
+        b. slave mount
+        c. private mount
+        d. unbindable mount
+2a) A shared mount can be replicated to as many mountpoints and all the
+replicas continue to be exactly same.
+        Here is an example:
+        Lets say /mnt has a mount that is shared.
+        mount --make-shared /mnt
+        note: mount command does not yet support the --make-shared flag.
+        I have included a small C program which does the same by executing
+        'smount /mnt shared'
+        #mount --bind /mnt /tmp
+        The above command replicates the mount at /mnt to the mountpoint /tmp
+        and the contents of both the mounts remain identical.
+        #ls /mnt
+        a b c
+        #ls /tmp
+        a b c
+        Now lets say we mount a device at /tmp/a
+        #mount /dev/sd0  /tmp/a
+        #ls /tmp/a
+        t1 t2 t2
+        #ls /mnt/a
+        t1 t2 t2
+        Note that the mount has propagated to the mount at /mnt as well.
+        And the same is true even when /dev/sd0 is mounted on /mnt/a. The
+        contents will be visible under /tmp/a too.
+2b) A slave mount is like a shared mount except that mount and umount events
+        only propagate towards it.
+        All slave mounts have a master mount which is a shared.
+        Here is an example:
+        Lets say /mnt has a mount which is shared.
+        #mount --make-shared /mnt
+        Lets bind mount /mnt to /tmp
+        #mount --bind /mnt /tmp
+        the new mount at /tmp becomes a shared mount and it is a replica of
+        the mount at /mnt.
+        Now lets make the mount at /tmp; a slave of /mnt
+        #mount --make-slave /tmp
+        [or smount /tmp slave]
+        lets mount /dev/sd0 on /mnt/a
+        #mount /dev/sd0 /mnt/a
+        #ls /mnt/a
+        t1 t2 t3
+        #ls /tmp/a
+        t1 t2 t3
+        Note the mount event has propagated to the mount at /tmp
+        However lets see what happens if we mount something on the mount at /tmp
+        #mount /dev/sd1 /tmp/b
+        #ls /tmp/b
+        s1 s2 s3
+        #ls /mnt/b
+        Note how the mount event has not propagated to the mount at
+        /mnt
+2c) A private mount does not forward or receive propagation.
+        This is the mount we are familiar with. Its the default type.
+2d) A unbindable mount is a unbindable private mount
+        lets say we have a mount at /mnt and we make is unbindable
+        #mount --make-unbindable /mnt
+         [ smount /mnt  unbindable ]
+         Lets try to bind mount this mount somewhere else.
+         # mount --bind /mnt /tmp
+         mount: wrong fs type, bad option, bad superblock on /mnt,
+                or too many mounted file systems
+        Binding a unbindable mount is a invalid operation.
+3) smount command
+        Currently the mount command is not aware of shared subtree features.
+        Work is in progress to add the support in mount ( util-linux package ).
+        Till then use the following program.
+        ------------------------------------------------------------------------
+        //
+        //this code was developed my Miklos Szeredi <miklos@szeredi.hu>
+        //and modified by Ram Pai <linuxram@us.ibm.com>
+        // sample usage:
+        //              smount /tmp shared
+        //
+        #include <stdio.h>
+        #include <stdlib.h>
+        #include <unistd.h>
+        #include <sys/mount.h>
+        #include <sys/fsuid.h>
+        #ifndef MS_REC
+        #define MS_REC          0x4000  /* 16384: Recursive loopback */
+        #endif
+        #ifndef MS_SHARED
+        #define MS_SHARED               1<<20   /* Shared */
+        #endif
+        #ifndef MS_PRIVATE
+        #define MS_PRIVATE              1<<18   /* Private */
+        #endif
+        #ifndef MS_SLAVE
+        #define MS_SLAVE                1<<19   /* Slave */
+        #endif
+        #ifndef MS_UNBINDABLE
+        #define MS_UNBINDABLE           1<<17   /* Unbindable */
+        #endif
+        int main(int argc, char *argv[])
+        {
+                int type;
+                if(argc != 3) {
+                        fprintf(stderr, "usage: %s dir "
+                        "<rshared|rslave|rprivate|runbindable|shared|slave"
+                        "|private|unbindable>\n" , argv[0]);
+                        return 1;
+                }
+                fprintf(stdout, "%s %s %s\n", argv[0], argv[1], argv[2]);
+                if (strcmp(argv[2],"rshared")==0)
+                        type=(MS_SHARED|MS_REC);
+                else if (strcmp(argv[2],"rslave")==0)
+                        type=(MS_SLAVE|MS_REC);
+                else if (strcmp(argv[2],"rprivate")==0)
+                        type=(MS_PRIVATE|MS_REC);
+                else if (strcmp(argv[2],"runbindable")==0)
+                        type=(MS_UNBINDABLE|MS_REC);
+                else if (strcmp(argv[2],"shared")==0)
+                        type=MS_SHARED;
+                else if (strcmp(argv[2],"slave")==0)
+                        type=MS_SLAVE;
+                else if (strcmp(argv[2],"private")==0)
+                        type=MS_PRIVATE;
+                else if (strcmp(argv[2],"unbindable")==0)
+                        type=MS_UNBINDABLE;
+                else {
+                        fprintf(stderr, "invalid operation: %s\n", argv[2]);
+                        return 1;
+                }
+                setfsuid(getuid());
+                if(mount("", argv[1], "dontcare", type, "") == -1) {
+                        perror("mount");
+                        return 1;
+                }
+                return 0;
+        }
+        -----------------------------------------------------------------------
+        Copy the above code snippet into smount.c
+        gcc -o smount smount.c
+        (i) To mark all the mounts under /mnt as shared execute the following
+        command:
+                smount /mnt rshared
+                the corresponding syntax planned for mount command is
+                mount --make-rshared /mnt
+            just to mark a mount /mnt as shared, execute the following
+            command:
+                smount /mnt shared
+                the corresponding syntax planned for mount command is
+                mount --make-shared /mnt
+        (ii) To mark all the shared mounts under /mnt as slave execute the
+        following
+             command:
+                smount /mnt rslave
+                the corresponding syntax planned for mount command is
+                mount --make-rslave /mnt
+            just to mark a mount /mnt as slave, execute the following
+            command:
+                smount /mnt slave
+                the corresponding syntax planned for mount command is
+                mount --make-slave /mnt
+        (iii) To mark all the mounts under /mnt as private execute the
+        following command:
+                smount /mnt rprivate
+                the corresponding syntax planned for mount command is
+                mount --make-rprivate /mnt
+            just to mark a mount /mnt as private, execute the following
+            command:
+                smount /mnt private
+                the corresponding syntax planned for mount command is
+                mount --make-private /mnt
+              NOTE: by default all the mounts are created as private. But if
+              you want to change some shared/slave/unbindable  mount as
+              private at a later point in time, this command can help.
+        (iv) To mark all the mounts under /mnt as unbindable execute the
+        following
+             command:
+                smount /mnt runbindable
+                the corresponding syntax planned for mount command is
+                mount --make-runbindable /mnt
+            just to mark a mount /mnt as unbindable, execute the following
+            command:
+                smount /mnt unbindable
+                the corresponding syntax planned for mount command is
+                mount --make-unbindable /mnt
+4) Use cases
+------------
+        A) A process wants to clone its own namespace, but still wants to
+           access the CD that got mounted recently.
+           Solution:
+                The system administrator can make the mount at /cdrom shared
+                mount --bind /cdrom /cdrom
+                mount --make-shared /cdrom
+                Now any process that clones off a new namespace will have a
+                mount at /cdrom which is a replica of the same mount in the
+                parent namespace.
+                So when a CD is inserted and mounted at /cdrom that mount gets
+                propagated to the other mount at /cdrom in all the other clone
+                namespaces.
+        B) A process wants its mounts invisible to any other process, but
+        still be able to see the other system mounts.
+           Solution:
+                To begin with, the administrator can mark the entire mount tree
+                as shareable.
+                mount --make-rshared /
+                A new process can clone off a new namespace. And mark some part
+                of its namespace as slave
+                mount --make-rslave /myprivatetree
+                Hence forth any mounts within the /myprivatetree done by the
+                process will not show up in any other namespace. However mounts
+                done in the parent namespace under /myprivatetree still shows
+                up in the process's namespace.
+        Apart from the above semantics this feature provides the
+        building blocks to solve the following problems:
+        C)  Per-user namespace
+                The above semantics allows a way to share mounts across
+                namespaces.  But namespaces are associated with processes. If
+                namespaces are made first class objects with user API to
+                associate/disassociate a namespace with userid, then each user
+                could have his/her own namespace and tailor it to his/her
+                requirements. Offcourse its needs support from PAM.
+        D)  Versioned files
+                If the entire mount tree is visible at multiple locations, then
+                a underlying versioning file system can return different
+                version of the file depending on the path used to access that
+                file.
+                An example is:
+                mount --make-shared /
+                mount --rbind / /view/v1
+                mount --rbind / /view/v2
+                mount --rbind / /view/v3
+                mount --rbind / /view/v4
+                and if /usr has a versioning filesystem mounted, than that
+                mount appears at /view/v1/usr, /view/v2/usr, /view/v3/usr and
+                /view/v4/usr too
+                A user can request v3 version of the file /usr/fs/namespace.c
+                by accessing /view/v3/usr/fs/namespace.c . The underlying
+                versioning filesystem can then decipher that v3 version of the
+                filesystem is being requested and return the corresponding
+                inode.
+5) Detailed semantics:
+-------------------
+        The section below explains the detailed semantics of
+        bind, rbind, move, mount, umount and clone-namespace operations.
+        Note: the word 'vfsmount' and the noun 'mount' have been used
+        to mean the same thing, throughout this document.
+5a) Mount states
+        A given mount can be in one of the following states
+        1) shared
+        2) slave
+        3) shared and slave
+        4) private
+        5) unbindable
+        A 'propagation event' is defined as event generated on a vfsmount
+        that leads to mount or unmount actions in other vfsmounts.
+        A 'peer group' is defined as a group of vfsmounts that propagate
+        events to each other.
+        (1) Shared mounts
+                A 'shared mount' is defined as a vfsmount that belongs to a
+                'peer group'.
+                For example:
+                        mount --make-shared /mnt
+                        mount --bin /mnt /tmp
+                The mount at /mnt and that at /tmp are both shared and belong
+                to the same peer group. Anything mounted or unmounted under
+                /mnt or /tmp reflect in all the other mounts of its peer
+                group.
+        (2) Slave mounts
+                A 'slave mount' is defined as a vfsmount that receives
+                propagation events and does not forward propagation events.
+                A slave mount as the name implies has a master mount from which
+                mount/unmount events are received. Events do not propagate from
+                the slave mount to the master.  Only a shared mount can be made
+                a slave by executing the following command
+                        mount --make-slave mount
+                A shared mount that is made as a slave is no more shared unless
+                modified to become shared.
+        (3) Shared and Slave
+                A vfsmount can be both shared as well as slave.  This state
+                indicates that the mount is a slave of some vfsmount, and
+                has its own peer group too.  This vfsmount receives propagation
+                events from its master vfsmount, and also forwards propagation
+                events to its 'peer group' and to its slave vfsmounts.
+                Strictly speaking, the vfsmount is shared having its own
+                peer group, and this peer-group is a slave of some other
+                peer group.
+                Only a slave vfsmount can be made as 'shared and slave' by
+                either executing the following command
+                        mount --make-shared mount
+                or by moving the slave vfsmount under a shared vfsmount.
+        (4) Private mount
+                A 'private mount' is defined as vfsmount that does not
+                receive or forward any propagation events.
+        (5) Unbindable mount
+                A 'unbindable mount' is defined as vfsmount that does not
+                receive or forward any propagation events and cannot
+                be bind mounted.
+        State diagram:
+        The state diagram below explains the state transition of a mount,
+        in response to various commands.
+        ------------------------------------------------------------------------
+        |             |make-shared |  make-slave  | make-private |make-unbindab|
+        --------------|------------|--------------|--------------|-------------|
+        |shared       |shared      |*slave/private|   private    | unbindable  |
+        |             |            |              |              |             |
+        |-------------|------------|--------------|--------------|-------------|
+        |slave        |shared      |    **slave   |    private   | unbindable  |
+        |             |and slave   |              |              |             |
+        |-------------|------------|--------------|--------------|-------------|
+        |shared       |shared      |    slave     |    private   | unbindable  |
+        |and slave    |and slave   |              |              |             |
+        |-------------|------------|--------------|--------------|-------------|
+        |private      |shared      |  **private   |    private   | unbindable  |
+        |-------------|------------|--------------|--------------|-------------|
+        |unbindable   |shared      |**unbindable  |    private   | unbindable  |
+        ------------------------------------------------------------------------
+        * if the shared mount is the only mount in its peer group, making it
+        slave, makes it private automatically. Note that there is no master to
+        which it can be slaved to.
+        ** slaving a non-shared mount has no effect on the mount.
+        Apart from the commands listed below, the 'move' operation also changes
+        the state of a mount depending on type of the destination mount. Its
+        explained in section 5d.
+5b) Bind semantics
+        Consider the following command
+        mount --bind A/a  B/b
+        where 'A' is the source mount, 'a' is the dentry in the mount 'A', 'B'
+        is the destination mount and 'b' is the dentry in the destination mount.
+        The outcome depends on the type of mount of 'A' and 'B'. The table
+        below contains quick reference.
+   ---------------------------------------------------------------------------
+   |         BIND MOUNT OPERATION                                            |
+   |**************************************************************************
+   |source(A)->| shared       |       private  |       slave    | unbindable |
+   | dest(B)  |               |                |                |            |
+   |   |      |               |                |                |            |
+   |   v      |               |                |                |            |
+   |**************************************************************************
+   |  shared  | shared        |     shared     | shared & slave |  invalid   |
+   |          |               |                |                |            |
+   |non-shared| shared        |      private   |      slave     |  invalid   |
+   ***************************************************************************
+        Details:
+        1. 'A' is a shared mount and 'B' is a shared mount. A new mount 'C'
+        which is clone of 'A', is created. Its root dentry is 'a' . 'C' is
+        mounted on mount 'B' at dentry 'b'. Also new mount 'C1', 'C2', 'C3' ...
+        are created and mounted at the dentry 'b' on all mounts where 'B'
+        propagates to. A new propagation tree containing 'C1',..,'Cn' is
+        created. This propagation tree is identical to the propagation tree of
+        'B'.  And finally the peer-group of 'C' is merged with the peer group
+        of 'A'.
+        2. 'A' is a private mount and 'B' is a shared mount. A new mount 'C'
+        which is clone of 'A', is created. Its root dentry is 'a'. 'C' is
+        mounted on mount 'B' at dentry 'b'. Also new mount 'C1', 'C2', 'C3' ...
+        are created and mounted at the dentry 'b' on all mounts where 'B'
+        propagates to. A new propagation tree is set containing all new mounts
+        'C', 'C1', .., 'Cn' with exactly the same configuration as the
+        propagation tree for 'B'.
+        3. 'A' is a slave mount of mount 'Z' and 'B' is a shared mount. A new
+        mount 'C' which is clone of 'A', is created. Its root dentry is 'a' .
+        'C' is mounted on mount 'B' at dentry 'b'. Also new mounts 'C1', 'C2',
+        'C3' ... are created and mounted at the dentry 'b' on all mounts where
+        'B' propagates to. A new propagation tree containing the new mounts
+        'C','C1',..  'Cn' is created. This propagation tree is identical to the
+        propagation tree for 'B'. And finally the mount 'C' and its peer group
+        is made the slave of mount 'Z'.  In other words, mount 'C' is in the
+        state 'slave and shared'.
+        4. 'A' is a unbindable mount and 'B' is a shared mount. This is a
+        invalid operation.
+        5. 'A' is a private mount and 'B' is a non-shared(private or slave or
+        unbindable) mount. A new mount 'C' which is clone of 'A', is created.
+        Its root dentry is 'a'. 'C' is mounted on mount 'B' at dentry 'b'.
+        6. 'A' is a shared mount and 'B' is a non-shared mount. A new mount 'C'
+        which is a clone of 'A' is created. Its root dentry is 'a'. 'C' is
+        mounted on mount 'B' at dentry 'b'.  'C' is made a member of the
+        peer-group of 'A'.
+        7. 'A' is a slave mount of mount 'Z' and 'B' is a non-shared mount. A
+        new mount 'C' which is a clone of 'A' is created. Its root dentry is
+        'a'.  'C' is mounted on mount 'B' at dentry 'b'. Also 'C' is set as a
+        slave mount of 'Z'. In other words 'A' and 'C' are both slave mounts of
+        'Z'.  All mount/unmount events on 'Z' propagates to 'A' and 'C'. But
+        mount/unmount on 'A' do not propagate anywhere else. Similarly
+        mount/unmount on 'C' do not propagate anywhere else.
+        8. 'A' is a unbindable mount and 'B' is a non-shared mount. This is a
+        invalid operation. A unbindable mount cannot be bind mounted.
+5c) Rbind semantics
+        rbind is same as bind. Bind replicates the specified mount.  Rbind
+        replicates all the mounts in the tree belonging to the specified mount.
+        Rbind mount is bind mount applied to all the mounts in the tree.
+        If the source tree that is rbind has some unbindable mounts,
+        then the subtree under the unbindable mount is pruned in the new
+        location.
+        eg: lets say we have the following mount tree.
+                A
+              /   \
+              B   C
+             / \ / \
+             D E F G
+             Lets say all the mount except the mount C in the tree are
+             of a type other than unbindable.
+             If this tree is rbound to say Z
+             We will have the following tree at the new location.
+                Z
+                |
+                A'
+               /
+              B'                Note how the tree under C is pruned
+             / \                in the new location.
+            D' E'
+5d) Move semantics
+        Consider the following command
+        mount --move A  B/b
+        where 'A' is the source mount, 'B' is the destination mount and 'b' is
+        the dentry in the destination mount.
+        The outcome depends on the type of the mount of 'A' and 'B'. The table
+        below is a quick reference.
+   ---------------------------------------------------------------------------
+   |                    MOVE MOUNT OPERATION                                 |
+   |**************************************************************************
+   | source(A)->| shared      |       private  |       slave    | unbindable |
+   | dest(B)  |               |                |                |            |
+   |   |      |               |                |                |            |
+   |   v      |               |                |                |            |
+   |**************************************************************************
+   |  shared  | shared        |     shared     |shared and slave|  invalid   |
+   |          |               |                |                |            |
+   |non-shared| shared        |      private   |    slave       | unbindable |
+   ***************************************************************************
+        NOTE: moving a mount residing under a shared mount is invalid.
+      Details follow:
+        1. 'A' is a shared mount and 'B' is a shared mount.  The mount 'A' is
+        mounted on mount 'B' at dentry 'b'.  Also new mounts 'A1', 'A2'...'An'
+        are created and mounted at dentry 'b' on all mounts that receive
+        propagation from mount 'B'. A new propagation tree is created in the
+        exact same configuration as that of 'B'. This new propagation tree
+        contains all the new mounts 'A1', 'A2'...  'An'.  And this new
+        propagation tree is appended to the already existing propagation tree
+        of 'A'.
+        2. 'A' is a private mount and 'B' is a shared mount. The mount 'A' is
+        mounted on mount 'B' at dentry 'b'. Also new mount 'A1', 'A2'... 'An'
+        are created and mounted at dentry 'b' on all mounts that receive
+        propagation from mount 'B'. The mount 'A' becomes a shared mount and a
+        propagation tree is created which is identical to that of
+        'B'. This new propagation tree contains all the new mounts 'A1',
+        'A2'...  'An'.
+        3. 'A' is a slave mount of mount 'Z' and 'B' is a shared mount.  The
+        mount 'A' is mounted on mount 'B' at dentry 'b'.  Also new mounts 'A1',
+        'A2'... 'An' are created and mounted at dentry 'b' on all mounts that
+        receive propagation from mount 'B'. A new propagation tree is created
+        in the exact same configuration as that of 'B'. This new propagation
+        tree contains all the new mounts 'A1', 'A2'...  'An'.  And this new
+        propagation tree is appended to the already existing propagation tree of
+        'A'.  Mount 'A' continues to be the slave mount of 'Z' but it also
+        becomes 'shared'.
+        4. 'A' is a unbindable mount and 'B' is a shared mount. The operation
+        is invalid. Because mounting anything on the shared mount 'B' can
+        create new mounts that get mounted on the mounts that receive
+        propagation from 'B'.  And since the mount 'A' is unbindable, cloning
+        it to mount at other mountpoints is not possible.
+        5. 'A' is a private mount and 'B' is a non-shared(private or slave or
+        unbindable) mount. The mount 'A' is mounted on mount 'B' at dentry 'b'.
+        6. 'A' is a shared mount and 'B' is a non-shared mount.  The mount 'A'
+        is mounted on mount 'B' at dentry 'b'.  Mount 'A' continues to be a
+        shared mount.
+        7. 'A' is a slave mount of mount 'Z' and 'B' is a non-shared mount.
+        The mount 'A' is mounted on mount 'B' at dentry 'b'.  Mount 'A'
+        continues to be a slave mount of mount 'Z'.
+        8. 'A' is a unbindable mount and 'B' is a non-shared mount. The mount
+        'A' is mounted on mount 'B' at dentry 'b'. Mount 'A' continues to be a
+        unbindable mount.
+5e) Mount semantics
+        Consider the following command
+        mount device  B/b
+        'B' is the destination mount and 'b' is the dentry in the destination
+        mount.
+        The above operation is the same as bind operation with the exception
+        that the source mount is always a private mount.
+5f) Unmount semantics
+        Consider the following command
+        umount A
+        where 'A' is a mount mounted on mount 'B' at dentry 'b'.
+        If mount 'B' is shared, then all most-recently-mounted mounts at dentry
+        'b' on mounts that receive propagation from mount 'B' and does not have
+        sub-mounts within them are unmounted.
+        Example: Lets say 'B1', 'B2', 'B3' are shared mounts that propagate to
+        each other.
+        lets say 'A1', 'A2', 'A3' are first mounted at dentry 'b' on mount
+        'B1', 'B2' and 'B3' respectively.
+        lets say 'C1', 'C2', 'C3' are next mounted at the same dentry 'b' on
+        mount 'B1', 'B2' and 'B3' respectively.
+        if 'C1' is unmounted, all the mounts that are most-recently-mounted on
+        'B1' and on the mounts that 'B1' propagates-to are unmounted.
+        'B1' propagates to 'B2' and 'B3'. And the most recently mounted mount
+        on 'B2' at dentry 'b' is 'C2', and that of mount 'B3' is 'C3'.
+        So all 'C1', 'C2' and 'C3' should be unmounted.
+        If any of 'C2' or 'C3' has some child mounts, then that mount is not
+        unmounted, but all other mounts are unmounted. However if 'C1' is told
+        to be unmounted and 'C1' has some sub-mounts, the umount operation is
+        failed entirely.
+5g) Clone Namespace
+        A cloned namespace contains all the mounts as that of the parent
+        namespace.
+        Lets say 'A' and 'B' are the corresponding mounts in the parent and the
+        child namespace.
+        If 'A' is shared, then 'B' is also shared and 'A' and 'B' propagate to
+        each other.
+        If 'A' is a slave mount of 'Z', then 'B' is also the slave mount of
+        'Z'.
+        If 'A' is a private mount, then 'B' is a private mount too.
+        If 'A' is unbindable mount, then 'B' is a unbindable mount too.
+6) Quiz
+        A. What is the result of the following command sequence?
+                mount --bind /mnt /mnt
+                mount --make-shared /mnt
+                mount --bind /mnt /tmp
+                mount --move /tmp /mnt/1
+                what should be the contents of /mnt /mnt/1 /mnt/1/1 should be?
+                Should they all be identical? or should /mnt and /mnt/1 be
+                identical only?
+        B. What is the result of the following command sequence?
+                mount --make-rshared /
+                mkdir -p /v/1
+                mount --rbind / /v/1
+                what should be the content of /v/1/v/1 be?
+        C. What is the result of the following command sequence?
+                mount --bind /mnt /mnt
+                mount --make-shared /mnt
+                mkdir -p /mnt/1/2/3 /mnt/1/test
+                mount --bind /mnt/1 /tmp
+                mount --make-slave /mnt
+                mount --make-shared /mnt
+                mount --bind /mnt/1/2 /tmp1
+                mount --make-slave /mnt
+                At this point we have the first mount at /tmp and
+                its root dentry is 1. Lets call this mount 'A'
+                And then we have a second mount at /tmp1 with root
+                dentry 2. Lets call this mount 'B'
+                Next we have a third mount at /mnt with root dentry
+                mnt. Lets call this mount 'C'
+                'B' is the slave of 'A' and 'C' is a slave of 'B'
+                A -> B -> C
+                at this point if we execute the following command
+                mount --bind /bin /tmp/test
+                The mount is attempted on 'A'
+                will the mount propagate to 'B' and 'C' ?
+                what would be the contents of
+                /mnt/1/test be?
+7) FAQ
+        Q1. Why is bind mount needed? How is it different from symbolic links?
+                symbolic links can get stale if the destination mount gets
+                unmounted or moved. Bind mounts continue to exist even if the
+                other mount is unmounted or moved.
+        Q2. Why can't the shared subtree be implemented using exportfs?
+                exportfs is a heavyweight way of accomplishing part of what
+                shared subtree can do. I cannot imagine a way to implement the
+                semantics of slave mount using exportfs?
+        Q3 Why is unbindable mount needed?
+                Lets say we want to replicate the mount tree at multiple
+                locations within the same subtree.
+                if one rbind mounts a tree within the same subtree 'n' times
+                the number of mounts created is an exponential function of 'n'.
+                Having unbindable mount can help prune the unneeded bind
+                mounts. Here is a example.
+                step 1:
+                   lets say the root tree has just two directories with
+                   one vfsmount.
+                                    root
+                                   /    \
+                                  tmp    usr
+                    And we want to replicate the tree at multiple
+                    mountpoints under /root/tmp
+                step2:
+                      mount --make-shared /root
+                      mkdir -p /tmp/m1
+                      mount --rbind /root /tmp/m1
+                      the new tree now looks like this:
+                                    root
+                                   /    \
+                                 tmp    usr
+                                /
+                               m1
+                              /  \
+                             tmp  usr
+                             /
+                            m1
+                          it has two vfsmounts
+                step3:
+                            mkdir -p /tmp/m2
+                            mount --rbind /root /tmp/m2
+                        the new tree now looks like this:
+                                      root
+                                     /    \
+                                   tmp     usr
+                                  /    \
+                                m1       m2
+                               / \       /  \
+                             tmp  usr   tmp  usr
+                             / \          /
+                            m1  m2      m1
+                                / \     /  \
+                              tmp usr  tmp   usr
+                              /        / \
+                             m1       m1  m2
+                            /  \
+                          tmp   usr
+                          /  \
+                         m1   m2
+                       it has 6 vfsmounts
+                step 4:
+                          mkdir -p /tmp/m3
+                          mount --rbind /root /tmp/m3
+                          I wont' draw the tree..but it has 24 vfsmounts
+                at step i the number of vfsmounts is V[i] = i*V[i-1].
+                This is an exponential function. And this tree has way more
+                mounts than what we really needed in the first place.
+                One could use a series of umount at each step to prune
+                out the unneeded mounts. But there is a better solution.
+                Unclonable mounts come in handy here.
+                step 1:
+                   lets say the root tree has just two directories with
+                   one vfsmount.
+                                    root
+                                   /    \
+                                  tmp    usr
+                    How do we set up the same tree at multiple locations under
+                    /root/tmp
+                step2:
+                      mount --bind /root/tmp /root/tmp
+                      mount --make-rshared /root
+                      mount --make-unbindable /root/tmp
+                      mkdir -p /tmp/m1
+                      mount --rbind /root /tmp/m1
+                      the new tree now looks like this:
+                                    root
+                                   /    \
+                                 tmp    usr
+                                /
+                               m1
+                              /  \
+                             tmp  usr
+                step3:
+                            mkdir -p /tmp/m2
+                            mount --rbind /root /tmp/m2
+                      the new tree now looks like this:
+                                    root
+                                   /    \
+                                 tmp    usr
+                                /   \
+                               m1     m2
+                              /  \     / \
+                             tmp  usr tmp usr
+                step4:
+                            mkdir -p /tmp/m3
+                            mount --rbind /root /tmp/m3
+                      the new tree now looks like this:
+                                          root
+                                      /           \
+                                     tmp           usr
+                                 /    \    \
+                               m1     m2     m3
+                              /  \     / \    /  \
+                             tmp  usr tmp usr tmp usr
+8) Implementation
+8A) Datastructure
+        4 new fields are introduced to struct vfsmount
+        ->mnt_share
+        ->mnt_slave_list
+        ->mnt_slave
+        ->mnt_master
+        ->mnt_share links togather all the mount to/from which this vfsmount
+                send/receives propagation events.
+        ->mnt_slave_list links all the mounts to which this vfsmount propagates
+                to.
+        ->mnt_slave links togather all the slaves that its master vfsmount
+                propagates to.
+        ->mnt_master points to the master vfsmount from which this vfsmount
+                receives propagation.
+        ->mnt_flags takes two more flags to indicate the propagation status of
+                the vfsmount.  MNT_SHARE indicates that the vfsmount is a shared
+                vfsmount.  MNT_UNCLONABLE indicates that the vfsmount cannot be
+                replicated.
+        All the shared vfsmounts in a peer group form a cyclic list through
+        ->mnt_share.
+        All vfsmounts with the same ->mnt_master form on a cyclic list anchored
+        in ->mnt_master->mnt_slave_list and going through ->mnt_slave.
+         ->mnt_master can point to arbitrary (and possibly different) members
+         of master peer group.  To find all immediate slaves of a peer group
+         you need to go through _all_ ->mnt_slave_list of its members.
+         Conceptually it's just a single set - distribution among the
+         individual lists does not affect propagation or the way propagation
+         tree is modified by operations.
+        A example propagation tree looks as shown in the figure below.
+        [ NOTE: Though it looks like a forest, if we consider all the shared
+        mounts as a conceptual entity called 'pnode', it becomes a tree]
+                        A <--> B <--> C <---> D
+                       /|\            /|      |\
+                      / F G          J K      H I
+                     /
+                    E<-->K
+                        /|\
+                       M L N
+        In the above figure  A,B,C and D all are shared and propagate to each
+        other.   'A' has got 3 slave mounts 'E' 'F' and 'G' 'C' has got 2 slave
+        mounts 'J' and 'K'  and  'D' has got two slave mounts 'H' and 'I'.
+        'E' is also shared with 'K' and they propagate to each other.  And
+        'K' has 3 slaves 'M', 'L' and 'N'
+        A's ->mnt_share links with the ->mnt_share of 'B' 'C' and 'D'
+        A's ->mnt_slave_list links with ->mnt_slave of 'E', 'K', 'F' and 'G'
+        E's ->mnt_share links with ->mnt_share of K
+        'E', 'K', 'F', 'G' have their ->mnt_master point to struct
+                                vfsmount of 'A'
+        'M', 'L', 'N' have their ->mnt_master point to struct vfsmount of 'K'
+        K's ->mnt_slave_list links with ->mnt_slave of 'M', 'L' and 'N'
+        C's ->mnt_slave_list links with ->mnt_slave of 'J' and 'K'
+        J and K's ->mnt_master points to struct vfsmount of C
+        and finally D's ->mnt_slave_list links with ->mnt_slave of 'H' and 'I'
+        'H' and 'I' have their ->mnt_master pointing to struct vfsmount of 'D'.
+        NOTE: The propagation tree is orthogonal to the mount tree.
+8B Algorithm:
+        The crux of the implementation resides in rbind/move operation.
+        The overall algorithm breaks the operation into 3 phases: (look at
+        attach_recursive_mnt() and propagate_mnt())
+        1. prepare phase.
+        2. commit phases.
+        3. abort phases.
+        Prepare phase:
+        for each mount in the source tree:
+                   a) Create the necessary number of mount trees to
+                        be attached to each of the mounts that receive
+                        propagation from the destination mount.
+                   b) Do not attach any of the trees to its destination.
+                      However note down its ->mnt_parent and ->mnt_mountpoint
+                   c) Link all the new mounts to form a propagation tree that
+                      is identical to the propagation tree of the destination
+                      mount.
+                   If this phase is successful, there should be 'n' new
+                   propagation trees; where 'n' is the number of mounts in the
+                   source tree.  Go to the commit phase
+                   Also there should be 'm' new mount trees, where 'm' is
+                   the number of mounts to which the destination mount
+                   propagates to.
+                   if any memory allocations fail, go to the abort phase.
+        Commit phase
+                attach each of the mount trees to their corresponding
+                destination mounts.
+        Abort phase
+                delete all the newly created trees.
+        NOTE: all the propagation related functionality resides in the file
+        pnode.c
+------------------------------------------------------------------------
+version 0.1  (created the initial document, Ram Pai linuxram@us.ibm.com)
+version 0.2  (Incorporated comments from Al Viro)
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 13cba955cb5a..2f27f391c7cc 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -167,7 +167,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    spdif           - Support SPDIF I/O
                    - Default: disabled
-    Module supports autoprobe and multiple chips (max 8).
+    This module supports one chip and autoprobe.
    The power-management is supported.
@@ -206,7 +206,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                          See "AC97 Quirk Option" section below.
    spdif_aclink        - S/PDIF transfer over AC-link (default = 1)
-    This module supports up to 8 cards and autoprobe.
+    This module supports one card and autoprobe.
    ATI IXP has two different methods to control SPDIF output.  One is
    over AC-link and another is over the "direct" SPDIF output.  The
@@ -218,7 +218,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    Module for ATI IXP 150/200/250 AC97 modem controllers.
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
    Note: The default index value of this module is -2, i.e. the first
          slot is excluded.
@@ -637,7 +637,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    model       - force the model name
    position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
    Each codec may have a model table for different configurations.
    If your machine isn't listed there, the default (usually minimal)
@@ -663,6 +663,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                        adjusted.  Appearing only when compiled with
                        $CONFIG_SND_DEBUG=y
+        ALC260
+          hp            HP machines
+          fujitsu       Fujitsu S7020
        CMI9880
          minimal       3-jack in back
          min_fp        3-jack in back, 2-jack in front
@@ -811,7 +815,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
                    semaphores (e.g. on some ASUS laptops)
                    (default off)
-    Module supports autoprobe and multiple bus-master chips (max 8).
+    This module supports one chip and autoprobe.
    Note: the latest driver supports auto-detection of chip clock.
    if you still encounter too fast playback, specify the clock
@@ -830,7 +834,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    ac97_clock    - AC'97 codec clock base (0 = auto-detect)
-    This module supports up to 8 cards and autoprobe.
+    This module supports one card and autoprobe.
    Note: The default index value of this module is -2, i.e. the first
          slot is excluded.
@@ -950,8 +954,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    use_cache        - 0 or 1 (disabled by default)
    vaio_hack        - alias buffer_top=0x25a800
    reset_workaround - enable AC97 RESET workaround for some laptops
+    reset_workaround2 - enable extended AC97 RESET workaround for some
+                      other laptops
-    Module supports autoprobe and multiple chips (max 8).
+    This module supports one chip and autoprobe.
    The power-management is supported.
@@ -980,6 +986,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    workaround is enabled automatically.  For other laptops with a
    hard freeze, you can try reset_workaround=1 option.
+    Note: Dell Latitude CSx laptops have another problem regarding
+    AC97 RESET.  On these laptops, reset_workaround2 option is
+    turned on as default.  This option is worth to try if the
+    previous reset_workaround option doesn't help.
    Note: This driver is really crappy.  It's a porting from the
    OSS driver, which is a result of black-magic reverse engineering.
    The detection of codec will fail if the driver is loaded *after*
@@ -1310,7 +1321,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    ac97_quirk  - AC'97 workaround for strange hardware
                  See "AC97 Quirk Option" section below.
-    Module supports autoprobe and multiple bus-master chips (max 8).
+    This module supports one chip and autoprobe.
    Note: on some SMP motherboards like MSI 694D the interrupts might
          not be generated properly.  In such a case, please try to
@@ -1352,7 +1363,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    ac97_clock  - AC'97 codec clock base (default 48000Hz)
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
    Note: The default index value of this module is -2, i.e. the first
          slot is excluded.
diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 24e85520890b..260334c98d95 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -18,8 +18,8 @@
      </affiliation>
     </author>
-     <date>March 6, 2005</date>
+     <date>October 6, 2005</date>
-     <edition>0.3.4</edition>
+     <edition>0.3.5</edition>
    <abstract>
      <para>
@@ -30,7 +30,7 @@
    <legalnotice>
    <para>
-    Copyright (c) 2002-2004  Takashi Iwai <email>tiwai@suse.de</email>
+    Copyright (c) 2002-2005  Takashi Iwai <email>tiwai@suse.de</email>
    </para>
    <para>
@@ -1433,25 +1433,10 @@
        <informalexample>
          <programlisting>
 <![CDATA[
-  if (chip->res_port) {
+  release_and_free_resource(chip->res_port);
-          release_resource(chip->res_port);
-          kfree_nocheck(chip->res_port);
-  }
 ]]>
          </programlisting>
        </informalexample>
-      As you can see, the resource pointer is also to be freed
-      via <function>kfree_nocheck()</function> after
-      <function>release_resource()</function> is called. You
-      cannot use <function>kfree()</function> here, because on ALSA,
-      <function>kfree()</function> may be a wrapper to its own
-      allocator with the memory debugging. Since the resource pointer
-      is allocated externally outside the ALSA, it must be released
-      via the native
-      <function>kfree()</function>.
-      <function>kfree_nocheck()</function> is used for that; it calls
-      the native <function>kfree()</function> without wrapper. 
      </para>
      <para>
@@ -2190,8 +2175,7 @@ struct _snd_pcm_runtime {
        unsigned int rate_den;
        /* -- SW params -- */
-        int tstamp_timespec;            /* use timeval (0) or timespec (1) */
+        struct timespec tstamp_mode;    /* mmap timestamp is updated */
-        snd_pcm_tstamp_t tstamp_mode;   /* mmap timestamp is updated */
        unsigned int period_step;
        unsigned int sleep_min;         /* min ticks to sleep */
        snd_pcm_uframes_t xfer_align;   /* xfer size need to be a multiple */
@@ -3709,8 +3693,7 @@ struct _snd_pcm_runtime {
        <para>
          Here, the chip instance is retrieved via
        <function>snd_kcontrol_chip()</function> macro.  This macro
-        converts from kcontrol-&gt;private_data to the type defined by
+        just accesses to kcontrol-&gt;private_data. The
-        <type>chip_t</type>. The
        kcontrol-&gt;private_data field is 
        given as the argument of <function>snd_ctl_new()</function>
        (see the later subsection
@@ -5998,32 +5981,23 @@ struct _snd_pcm_runtime {
        The first argument is the expression to evaluate, and the
      second argument is the action if it fails. When
      <constant>CONFIG_SND_DEBUG</constant>, is set, it will show an
-      error message such as <computeroutput>BUG? (xxx) (called from
+      error message such as <computeroutput>BUG? (xxx)</computeroutput>
-      yyy)</computeroutput>. When no debug flag is set, this is
+      together with stack trace.
-      ignored. 
      </para>
-    </section>
-    <section id="useful-functions-snd-runtime-check">
-      <title><function>snd_runtime_check()</function></title>
      <para>
-        This macro is quite similar with
+         When no debug flag is set, this macro is ignored. 
-      <function>snd_assert()</function>. Unlike
-      <function>snd_assert()</function>, the expression is always
-      evaluated regardless of
-      <constant>CONFIG_SND_DEBUG</constant>. When
-      <constant>CONFIG_SND_DEBUG</constant> is set, the macro will
-      show a message like <computeroutput>ERROR (xx) (called from
-      yyy)</computeroutput>. 
      </para>
    </section>
    <section id="useful-functions-snd-bug">
      <title><function>snd_BUG()</function></title>
      <para>
-        It calls <function>snd_assert(0,)</function> -- that is, just
+        It shows <computeroutput>BUG?</computeroutput> message and
-      prints the error message at the point. It's useful to show that
+      stack trace as well as <function>snd_assert</function> at the point.
-      a fatal error happens there. 
+      It's useful to show that a fatal error happens there. 
+      </para>
+      <para>
+         When no debug flag is set, this macro is ignored. 
      </para>
    </section>
  </chapter>
diff --git a/Documentation/sparse.txt b/Documentation/sparse.txt
index 1829009db771..3f1c5464b1c9 100644
--- a/Documentation/sparse.txt
+++ b/Documentation/sparse.txt
@@ -41,9 +41,9 @@ sure that bitwise types don't get mixed up (little-endian vs big-endian
 vs cpu-endian vs whatever), and there the constant "0" really _is_
 special.
-Modify top-level Makefile to say
+Use
-CHECK           = sparse -Wbitwise
+        make C=[12] CF=-Wbitwise
 or you don't get any checking at all.
diff --git a/Documentation/video4linux/API.html b/Documentation/video4linux/API.html
index 441407b12a9f..afbe9ae7ee96 100644
--- a/Documentation/video4linux/API.html
+++ b/Documentation/video4linux/API.html
@@ -8,7 +8,7 @@ V4L original API</a>
 </td><td>
 Obsoleted by V4L2 API
 </td></tr><tr><td>
-<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API.html>
+<A HREF=http://www.linuxtv.org/downloads/video4linux/API/V4L2_API>
 V4L2 API</a>
 </td><td>
 Should be used for new projects
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index ec785f9f15a3..330246ac80f8 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -1,137 +1,143 @@
-card=0 -  *** UNKNOWN/GENERIC ***
+  0 ->  *** UNKNOWN/GENERIC ***
-card=1 - MIRO PCTV
+  1 -> MIRO PCTV
-card=2 - Hauppauge (bt848)
+  2 -> Hauppauge (bt848)
-card=3 - STB, Gateway P/N 6000699 (bt848)
+  3 -> STB, Gateway P/N 6000699 (bt848)
-card=4 - Intel Create and Share PCI/ Smart Video Recorder III
+  4 -> Intel Create and Share PCI/ Smart Video Recorder III
-card=5 - Diamond DTV2000
+  5 -> Diamond DTV2000
-card=6 - AVerMedia TVPhone
+  6 -> AVerMedia TVPhone
-card=7 - MATRIX-Vision MV-Delta
+  7 -> MATRIX-Vision MV-Delta
-card=8 - Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26
+  8 -> Lifeview FlyVideo II (Bt848) LR26 / MAXI TV Video PCI2 LR26
-card=9 - IMS/IXmicro TurboTV
+  9 -> IMS/IXmicro TurboTV
-card=10 - Hauppauge (bt878)
+ 10 -> Hauppauge (bt878)                                   [0070:13eb,0070:3900,2636:10b4]
-card=11 - MIRO PCTV pro
+ 11 -> MIRO PCTV pro
-card=12 - ADS Technologies Channel Surfer TV (bt848)
+ 12 -> ADS Technologies Channel Surfer TV (bt848)
-card=13 - AVerMedia TVCapture 98
+ 13 -> AVerMedia TVCapture 98                              [1461:0002,1461:0004,1461:0300]
-card=14 - Aimslab Video Highway Xtreme (VHX)
+ 14 -> Aimslab Video Highway Xtreme (VHX)
-card=15 - Zoltrix TV-Max
+ 15 -> Zoltrix TV-Max                                      [a1a0:a0fc]
-card=16 - Prolink Pixelview PlayTV (bt878)
+ 16 -> Prolink Pixelview PlayTV (bt878)
-card=17 - Leadtek WinView 601
+ 17 -> Leadtek WinView 601
-card=18 - AVEC Intercapture
+ 18 -> AVEC Intercapture
-card=19 - Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)
+ 19 -> Lifeview FlyVideo II EZ /FlyKit LR38 Bt848 (capture only)
-card=20 - CEI Raffles Card
+ 20 -> CEI Raffles Card
-card=21 - Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50
+ 21 -> Lifeview FlyVideo 98/ Lucky Star Image World ConferenceTV LR50
-card=22 - Askey CPH050/ Phoebe Tv Master + FM
+ 22 -> Askey CPH050/ Phoebe Tv Master + FM                 [14ff:3002]
-card=23 - Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878
+ 23 -> Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV, bt878 [14c7:0101]
-card=24 - Askey CPH05X/06X (bt878) [many vendors]
+ 24 -> Askey CPH05X/06X (bt878) [many vendors]             [144f:3002,144f:3005,144f:5000,14ff:3000]
-card=25 - Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar
+ 25 -> Terratec TerraTV+ Version 1.0 (Bt848)/ Terra TValue Version 1.0/ Vobis TV-Boostar
-card=26 - Hauppauge WinCam newer (bt878)
+ 26 -> Hauppauge WinCam newer (bt878)
-card=27 - Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50
+ 27 -> Lifeview FlyVideo 98/ MAXI TV Video PCI2 LR50
-card=28 - Terratec TerraTV+ Version 1.1 (bt878)
+ 28 -> Terratec TerraTV+ Version 1.1 (bt878)               [153b:1127,1852:1852]
-card=29 - Imagenation PXC200
+ 29 -> Imagenation PXC200                                  [1295:200a]
-card=30 - Lifeview FlyVideo 98 LR50
+ 30 -> Lifeview FlyVideo 98 LR50                           [1f7f:1850]
-card=31 - Formac iProTV, Formac ProTV I (bt848)
+ 31 -> Formac iProTV, Formac ProTV I (bt848)
-card=32 - Intel Create and Share PCI/ Smart Video Recorder III
+ 32 -> Intel Create and Share PCI/ Smart Video Recorder III
-card=33 - Terratec TerraTValue Version Bt878
+ 33 -> Terratec TerraTValue Version Bt878                  [153b:1117,153b:1118,153b:1119,153b:111a,153b:1134,153b:5018]
-card=34 - Leadtek WinFast 2000/ WinFast 2000 XP
+ 34 -> Leadtek WinFast 2000/ WinFast 2000 XP               [107d:6606,107d:6609,6606:217d,f6ff:fff6]
-card=35 - Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II
+ 35 -> Lifeview FlyVideo 98 LR50 / Chronos Video Shuttle II [1851:1850,1851:a050]
-card=36 - Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner
+ 36 -> Lifeview FlyVideo 98FM LR50 / Typhoon TView TV/FM Tuner [1852:1852]
-card=37 - Prolink PixelView PlayTV pro
+ 37 -> Prolink PixelView PlayTV pro
-card=38 - Askey CPH06X TView99
+ 38 -> Askey CPH06X TView99                                [144f:3000,144f:a005,a04f:a0fc]
-card=39 - Pinnacle PCTV Studio/Rave
+ 39 -> Pinnacle PCTV Studio/Rave                           [11bd:0012,bd11:1200,bd11:ff00,11bd:ff12]
-card=40 - STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100
+ 40 -> STB TV PCI FM, Gateway P/N 6000704 (bt878), 3Dfx VoodooTV 100 [10b4:2636,10b4:2645,121a:3060]
-card=41 - AVerMedia TVPhone 98
+ 41 -> AVerMedia TVPhone 98                                [1461:0001,1461:0003]
-card=42 - ProVideo PV951
+ 42 -> ProVideo PV951                                      [aa0c:146c]
-card=43 - Little OnAir TV
+ 43 -> Little OnAir TV
-card=44 - Sigma TVII-FM
+ 44 -> Sigma TVII-FM
-card=45 - MATRIX-Vision MV-Delta 2
+ 45 -> MATRIX-Vision MV-Delta 2
-card=46 - Zoltrix Genie TV/FM
+ 46 -> Zoltrix Genie TV/FM                                 [15b0:4000,15b0:400a,15b0:400d,15b0:4010,15b0:4016]
-card=47 - Terratec TV/Radio+
+ 47 -> Terratec TV/Radio+                                  [153b:1123]
-card=48 - Askey CPH03x/ Dynalink Magic TView
+ 48 -> Askey CPH03x/ Dynalink Magic TView
-card=49 - IODATA GV-BCTV3/PCI
+ 49 -> IODATA GV-BCTV3/PCI                                 [10fc:4020]
-card=50 - Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP
+ 50 -> Prolink PV-BT878P+4E / PixelView PlayTV PAK / Lenco MXTV-9578 CP
-card=51 - Eagle Wireless Capricorn2 (bt878A)
+ 51 -> Eagle Wireless Capricorn2 (bt878A)
-card=52 - Pinnacle PCTV Studio Pro
+ 52 -> Pinnacle PCTV Studio Pro
-card=53 - Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS
+ 53 -> Typhoon TView RDS + FM Stereo / KNC1 TV Station RDS
-card=54 - Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]
+ 54 -> Lifeview FlyVideo 2000 /FlyVideo A2/ Lifetec LT 9415 TV [LR90]
-card=55 - Askey CPH031/ BESTBUY Easy TV
+ 55 -> Askey CPH031/ BESTBUY Easy TV
-card=56 - Lifeview FlyVideo 98FM LR50
+ 56 -> Lifeview FlyVideo 98FM LR50                         [a051:41a0]
-card=57 - GrandTec 'Grand Video Capture' (Bt848)
+ 57 -> GrandTec 'Grand Video Capture' (Bt848)              [4344:4142]
-card=58 - Askey CPH060/ Phoebe TV Master Only (No FM)
+ 58 -> Askey CPH060/ Phoebe TV Master Only (No FM)
-card=59 - Askey CPH03x TV Capturer
+ 59 -> Askey CPH03x TV Capturer
-card=60 - Modular Technology MM100PCTV
+ 60 -> Modular Technology MM100PCTV
-card=61 - AG Electronics GMV1
+ 61 -> AG Electronics GMV1                                 [15cb:0101]
-card=62 - Askey CPH061/ BESTBUY Easy TV (bt878)
+ 62 -> Askey CPH061/ BESTBUY Easy TV (bt878)
-card=63 - ATI TV-Wonder
+ 63 -> ATI TV-Wonder                                       [1002:0001]
-card=64 - ATI TV-Wonder VE
+ 64 -> ATI TV-Wonder VE                                    [1002:0003]
-card=65 - Lifeview FlyVideo 2000S LR90
+ 65 -> Lifeview FlyVideo 2000S LR90
-card=66 - Terratec TValueRadio
+ 66 -> Terratec TValueRadio                                [153b:1135,153b:ff3b]
-card=67 - IODATA GV-BCTV4/PCI
+ 67 -> IODATA GV-BCTV4/PCI                                 [10fc:4050]
-card=68 - 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)
+ 68 -> 3Dfx VoodooTV FM (Euro), VoodooTV 200 (USA)         [121a:3000,10b4:2637]
-card=69 - Active Imaging AIMMS
+ 69 -> Active Imaging AIMMS
-card=70 - Prolink Pixelview PV-BT878P+ (Rev.4C,8E)
+ 70 -> Prolink Pixelview PV-BT878P+ (Rev.4C,8E)
-card=71 - Lifeview FlyVideo 98EZ (capture only) LR51
+ 71 -> Lifeview FlyVideo 98EZ (capture only) LR51          [1851:1851]
-card=72 - Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM)
+ 72 -> Prolink Pixelview PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) [1554:4011]
-card=73 - Sensoray 311
+ 73 -> Sensoray 311                                        [6000:0311]
-card=74 - RemoteVision MX (RV605)
+ 74 -> RemoteVision MX (RV605)
-card=75 - Powercolor MTV878/ MTV878R/ MTV878F
+ 75 -> Powercolor MTV878/ MTV878R/ MTV878F
-card=76 - Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP)
+ 76 -> Canopus WinDVR PCI (COMPAQ Presario 3524JP, 5112JP) [0e11:0079]
-card=77 - GrandTec Multi Capture Card (Bt878)
+ 77 -> GrandTec Multi Capture Card (Bt878)
-card=78 - Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF
+ 78 -> Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF   [0a01:17de]
-card=79 - DSP Design TCVIDEO
+ 79 -> DSP Design TCVIDEO
-card=80 - Hauppauge WinTV PVR
+ 80 -> Hauppauge WinTV PVR                                 [0070:4500]
-card=81 - IODATA GV-BCTV5/PCI
+ 81 -> IODATA GV-BCTV5/PCI                                 [10fc:4070,10fc:d018]
-card=82 - Osprey 100/150 (878)
+ 82 -> Osprey 100/150 (878)                                [0070:ff00]
-card=83 - Osprey 100/150 (848)
+ 83 -> Osprey 100/150 (848)
-card=84 - Osprey 101 (848)
+ 84 -> Osprey 101 (848)
-card=85 - Osprey 101/151
+ 85 -> Osprey 101/151
-card=86 - Osprey 101/151 w/ svid
+ 86 -> Osprey 101/151 w/ svid
-card=87 - Osprey 200/201/250/251
+ 87 -> Osprey 200/201/250/251
-card=88 - Osprey 200/250
+ 88 -> Osprey 200/250                                      [0070:ff01]
-card=89 - Osprey 210/220
+ 89 -> Osprey 210/220
-card=90 - Osprey 500
+ 90 -> Osprey 500                                          [0070:ff02]
-card=91 - Osprey 540
+ 91 -> Osprey 540                                          [0070:ff04]
-card=92 - Osprey 2000
+ 92 -> Osprey 2000                                         [0070:ff03]
-card=93 - IDS Eagle
+ 93 -> IDS Eagle
-card=94 - Pinnacle PCTV Sat
+ 94 -> Pinnacle PCTV Sat                                   [11bd:001c]
-card=95 - Formac ProTV II (bt878)
+ 95 -> Formac ProTV II (bt878)
-card=96 - MachTV
+ 96 -> MachTV
-card=97 - Euresys Picolo
+ 97 -> Euresys Picolo
-card=98 - ProVideo PV150
+ 98 -> ProVideo PV150                                      [aa00:1460,aa01:1461,aa02:1462,aa03:1463,aa04:1464,aa05:1465,aa06:1466,aa07:1467]
-card=99 - AD-TVK503
+ 99 -> AD-TVK503
-card=100 - Hercules Smart TV Stereo
+100 -> Hercules Smart TV Stereo
-card=101 - Pace TV & Radio Card
+101 -> Pace TV & Radio Card
-card=102 - IVC-200
+102 -> IVC-200                                             [0000:a155,0001:a155,0002:a155,0003:a155,0100:a155,0101:a155,0102:a155,0103:a155]
-card=103 - Grand X-Guard / Trust 814PCI
+103 -> Grand X-Guard / Trust 814PCI                        [0304:0102]
-card=104 - Nebula Electronics DigiTV
+104 -> Nebula Electronics DigiTV                           [0071:0101]
-card=105 - ProVideo PV143
+105 -> ProVideo PV143                                      [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433]
-card=106 - PHYTEC VD-009-X1 MiniDIN (bt878)
+106 -> PHYTEC VD-009-X1 MiniDIN (bt878)
-card=107 - PHYTEC VD-009-X1 Combi (bt878)
+107 -> PHYTEC VD-009-X1 Combi (bt878)
-card=108 - PHYTEC VD-009 MiniDIN (bt878)
+108 -> PHYTEC VD-009 MiniDIN (bt878)
-card=109 - PHYTEC VD-009 Combi (bt878)
+109 -> PHYTEC VD-009 Combi (bt878)
-card=110 - IVC-100
+110 -> IVC-100                                             [ff00:a132]
-card=111 - IVC-120G
+111 -> IVC-120G                                            [ff00:a182,ff01:a182,ff02:a182,ff03:a182,ff04:a182,ff05:a182,ff06:a182,ff07:a182,ff08:a182,ff09:a182,ff0a:a182,ff0b:a182,ff0c:a182,ff0d:a182,ff0e:a182,ff0f:a182]
-card=112 - pcHDTV HD-2000 TV
+112 -> pcHDTV HD-2000 TV                                   [7063:2000]
-card=113 - Twinhan DST + clones
+113 -> Twinhan DST + clones                                [11bd:0026,1822:0001,270f:fc00]
-card=114 - Winfast VC100
+114 -> Winfast VC100                                       [107d:6607]
-card=115 - Teppro TEV-560/InterVision IV-560
+115 -> Teppro TEV-560/InterVision IV-560
-card=116 - SIMUS GVC1100
+116 -> SIMUS GVC1100                                       [aa6a:82b2]
-card=117 - NGS NGSTV+
+117 -> NGS NGSTV+
-card=118 - LMLBT4
+118 -> LMLBT4
-card=119 - Tekram M205 PRO
+119 -> Tekram M205 PRO
-card=120 - Conceptronic CONTVFMi
+120 -> Conceptronic CONTVFMi
-card=121 - Euresys Picolo Tetra
+121 -> Euresys Picolo Tetra                                [1805:0105,1805:0106,1805:0107,1805:0108]
-card=122 - Spirit TV Tuner
+122 -> Spirit TV Tuner
-card=123 - AVerMedia AVerTV DVB-T 771
+123 -> AVerMedia AVerTV DVB-T 771                          [1461:0771]
-card=124 - AverMedia AverTV DVB-T 761
+124 -> AverMedia AverTV DVB-T 761                          [1461:0761]
-card=125 - MATRIX Vision Sigma-SQ
+125 -> MATRIX Vision Sigma-SQ
-card=126 - MATRIX Vision Sigma-SLC
+126 -> MATRIX Vision Sigma-SLC
-card=127 - APAC Viewcomp 878(AMAX)
+127 -> APAC Viewcomp 878(AMAX)
-card=128 - DViCO FusionHDTV DVB-T Lite
+128 -> DViCO FusionHDTV DVB-T Lite                         [18ac:db10]
-card=129 - V-Gear MyVCD
+129 -> V-Gear MyVCD
-card=130 - Super TV Tuner
+130 -> Super TV Tuner
-card=131 - Tibet Systems 'Progress DVR' CS16
+131 -> Tibet Systems 'Progress DVR' CS16
-card=132 - Kodicom 4400R (master)
+132 -> Kodicom 4400R (master)
-card=133 - Kodicom 4400R (slave)
+133 -> Kodicom 4400R (slave)
-card=134 - Adlink RTV24
+134 -> Adlink RTV24
-card=135 - DViCO FusionHDTV 5 Lite
+135 -> DViCO FusionHDTV 5 Lite                             [18ac:d500]
-card=136 - Acorp Y878F
+136 -> Acorp Y878F                                         [9511:1540]
+137 -> Conceptronic CTVFMi v2
+138 -> Prolink Pixelview PV-BT878P+ (Rev.2E)
+139 -> Prolink PixelView PlayTV MPEG2 PV-M4900
+140 -> Osprey 440                                          [0070:ff07]
+141 -> Asound Skyeye PCTV
+142 -> Sabrent TV-FM (bttv version)
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index 03deb0726aa4..a1017d1a85d4 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -1,32 +1,37 @@
-card=0 - UNKNOWN/GENERIC
+  0 -> UNKNOWN/GENERIC
-card=1 - Hauppauge WinTV 34xxx models
+  1 -> Hauppauge WinTV 34xxx models                        [0070:3400,0070:3401]
-card=2 - GDI Black Gold
+  2 -> GDI Black Gold                                      [14c7:0106,14c7:0107]
-card=3 - PixelView
+  3 -> PixelView                                           [1554:4811]
-card=4 - ATI TV Wonder Pro
+  4 -> ATI TV Wonder Pro                                   [1002:00f8]
-card=5 - Leadtek Winfast 2000XP Expert
+  5 -> Leadtek Winfast 2000XP Expert                       [107d:6611,107d:6613]
-card=6 - AverTV Studio 303 (M126)
+  6 -> AverTV Studio 303 (M126)                            [1461:000b]
-card=7 - MSI TV-@nywhere Master
+  7 -> MSI TV-@nywhere Master                              [1462:8606]
-card=8 - Leadtek Winfast DV2000
+  8 -> Leadtek Winfast DV2000                              [107d:6620]
-card=9 - Leadtek PVR 2000
+  9 -> Leadtek PVR 2000                                    [107d:663b,107d:663C]
-card=10 - IODATA GV-VCP3/PCI
+ 10 -> IODATA GV-VCP3/PCI                                  [10fc:d003]
-card=11 - Prolink PlayTV PVR
+ 11 -> Prolink PlayTV PVR
-card=12 - ASUS PVR-416
+ 12 -> ASUS PVR-416                                        [1043:4823]
-card=13 - MSI TV-@nywhere
+ 13 -> MSI TV-@nywhere
-card=14 - KWorld/VStream XPert DVB-T
+ 14 -> KWorld/VStream XPert DVB-T                          [17de:08a6]
-card=15 - DViCO FusionHDTV DVB-T1
+ 15 -> DViCO FusionHDTV DVB-T1                             [18ac:db00]
-card=16 - KWorld LTV883RF
+ 16 -> KWorld LTV883RF
-card=17 - DViCO FusionHDTV 3 Gold-Q
+ 17 -> DViCO FusionHDTV 3 Gold-Q                           [18ac:d810]
-card=18 - Hauppauge Nova-T DVB-T
+ 18 -> Hauppauge Nova-T DVB-T                              [0070:9002]
-card=19 - Conexant DVB-T reference design
+ 19 -> Conexant DVB-T reference design                     [14f1:0187]
-card=20 - Provideo PV259
+ 20 -> Provideo PV259                                      [1540:2580]
-card=21 - DViCO FusionHDTV DVB-T Plus
+ 21 -> DViCO FusionHDTV DVB-T Plus                         [18ac:db10]
-card=22 - digitalnow DNTV Live! DVB-T
+ 22 -> pcHDTV HD3000 HDTV                                  [7063:3000]
-card=23 - pcHDTV HD3000 HDTV
+ 23 -> digitalnow DNTV Live! DVB-T                         [17de:a8a6]
-card=24 - Hauppauge WinTV 28xxx (Roslyn) models
+ 24 -> Hauppauge WinTV 28xxx (Roslyn) models               [0070:2801]
-card=25 - Digital-Logic MICROSPACE Entertainment Center (MEC)
+ 25 -> Digital-Logic MICROSPACE Entertainment Center (MEC) [14f1:0342]
-card=26 - IODATA GV/BCTV7E
+ 26 -> IODATA GV/BCTV7E                                    [10fc:d035]
-card=27 - PixelView PlayTV Ultra Pro (Stereo)
+ 27 -> PixelView PlayTV Ultra Pro (Stereo)
-card=28 - DViCO FusionHDTV 3 Gold-T
+ 28 -> DViCO FusionHDTV 3 Gold-T                           [18ac:d820]
-card=29 - ADS Tech Instant TV DVB-T PCI
+ 29 -> ADS Tech Instant TV DVB-T PCI                       [1421:0334]
-card=30 - TerraTec Cinergy 1400 DVB-T
+ 30 -> TerraTec Cinergy 1400 DVB-T                         [153b:1166]
-card=31 - DViCO FusionHDTV 5 Gold
+ 31 -> DViCO FusionHDTV 5 Gold                             [18ac:d500]
+ 32 -> AverMedia UltraTV Media Center PCI 550              [1461:8011]
+ 33 -> Kworld V-Stream Xpert DVD
+ 34 -> ATI HDTV Wonder                                     [1002:a101]
+ 35 -> WinFast DTV1000-T                                   [107d:665f]
+ 36 -> AVerTV 303 (M126)                                   [1461:000a]
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
new file mode 100644
index 000000000000..a0c7cad20971
--- /dev/null
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -0,0 +1,10 @@
+  0 -> Unknown EM2800 video grabber             (em2800)        [eb1a:2800]
+  1 -> Unknown EM2820/2840 video grabber        (em2820/em2840)
+  2 -> Terratec Cinergy 250 USB                 (em2820/em2840) [0ccd:0036]
+  3 -> Pinnacle PCTV USB 2                      (em2820/em2840) [2304:0208]
+  4 -> Hauppauge WinTV USB 2                    (em2820/em2840) [2040:4200]
+  5 -> MSI VOX USB 2.0                          (em2820/em2840) [eb1a:2820]
+  6 -> Terratec Cinergy 200 USB                 (em2800)
+  7 -> Leadtek Winfast USB II                   (em2800)
+  8 -> Kworld USB2800                           (em2800)
+  9 -> Pinnacle Dazzle DVC 90                   (em2820/em2840) [2304:0207]
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index dc57225f39be..efb708ec116a 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -6,10 +6,10 @@
  5 -> SKNet Monster TV                         [1131:4e85]
  6 -> Tevion MD 9717
  7 -> KNC One TV-Station RDS / Typhoon TV Tuner RDS [1131:fe01,1894:fe01]
-  8 -> Terratec Cinergy 400 TV                  [153B:1142]
+  8 -> Terratec Cinergy 400 TV                  [153b:1142]
  9 -> Medion 5044
 10 -> Kworld/KuroutoShikou SAA7130-TVPCI
- 11 -> Terratec Cinergy 600 TV                  [153B:1143]
+ 11 -> Terratec Cinergy 600 TV                  [153b:1143]
 12 -> Medion 7134                              [16be:0003]
 13 -> Typhoon TV+Radio 90031
 14 -> ELSA EX-VISION 300TV                     [1048:226b]
@@ -36,8 +36,8 @@
 35 -> AverMedia AverTV Studio 305              [1461:2115]
 36 -> UPMOST PURPLE TV                         [12ab:0800]
 37 -> Items MuchTV Plus / IT-005
- 38 -> Terratec Cinergy 200 TV                  [153B:1152]
+ 38 -> Terratec Cinergy 200 TV                  [153b:1152]
- 39 -> LifeView FlyTV Platinum Mini             [5168:0212]
+ 39 -> LifeView FlyTV Platinum Mini             [5168:0212,4e42:0212]
 40 -> Compro VideoMate TV PVR/FM               [185b:c100]
 41 -> Compro VideoMate TV Gold+                [185b:c100]
 42 -> Sabrent SBT-TVFM (saa7130)
@@ -46,7 +46,7 @@
 45 -> Avermedia AVerTV Studio 307              [1461:9715]
 46 -> AVerMedia Cardbus TV/Radio (E500)        [1461:d6ee]
 47 -> Terratec Cinergy 400 mobile              [153b:1162]
- 48 -> Terratec Cinergy 600 TV MK3              [153B:1158]
+ 48 -> Terratec Cinergy 600 TV MK3              [153b:1158]
 49 -> Compro VideoMate Gold+ Pal               [185b:c200]
 50 -> Pinnacle PCTV 300i DVB-T + PAL           [11bd:002d]
 51 -> ProVideo PV952                           [1540:9524]
@@ -56,12 +56,29 @@
 55 -> LifeView FlyDVB-T DUO                    [5168:0502,5168:0306]
 56 -> Avermedia AVerTV 307                     [1461:a70a]
 57 -> Avermedia AVerTV GO 007 FM               [1461:f31f]
- 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0370]
+ 58 -> ADS Tech Instant TV (saa7135)            [1421:0350,1421:0370,1421:1370]
 59 -> Kworld/Tevion V-Stream Xpert TV PVR7134
 60 -> Typhoon DVB-T Duo Digital/Analog Cardbus [4e42:0502]
 61 -> Philips TOUGH DVB-T reference design     [1131:2004]
 62 -> Compro VideoMate TV Gold+II
 63 -> Kworld Xpert TV PVR7134
- 64 -> FlyTV mini Asus Digimatrix               [1043:0210,1043:0210]
+ 64 -> FlyTV mini Asus Digimatrix               [1043:0210]
 65 -> V-Stream Studio TV Terminator
 66 -> Yuan TUN-900 (saa7135)
+ 67 -> Beholder BeholdTV 409 FM                 [0000:4091]
+ 68 -> GoTView 7135 PCI                         [5456:7135]
+ 69 -> Philips EUROPA V3 reference design       [1131:2004]
+ 70 -> Compro Videomate DVB-T300                [185b:c900]
+ 71 -> Compro Videomate DVB-T200                [185b:c901]
+ 72 -> RTD Embedded Technologies VFG7350        [1435:7350]
+ 73 -> RTD Embedded Technologies VFG7330        [1435:7330]
+ 74 -> LifeView FlyTV Platinum Mini2            [14c0:1212]
+ 75 -> AVerMedia AVerTVHD MCE A180              [1461:1044]
+ 76 -> SKNet MonsterTV Mobile                   [1131:4ee9]
+ 77 -> Pinnacle PCTV 110i (saa7133)             [11bd:002e]
+ 78 -> ASUSTeK P7131 Dual                       [1043:4862]
+ 79 -> Sedna/MuchTV PC TV Cardbus TV/Radio (ITO25 Rev:2B)
+ 80 -> ASUS Digimatrix TV                       [1043:0210]
+ 81 -> Philips Tiger reference design           [1131:2018]
+ 82 -> MSI TV@Anywhere plus                     [1462:6231]
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index f5876be658a6..9d6544ea9f41 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -53,7 +53,7 @@ tuner=51 - Philips PAL/SECAM_D (FM 1256 I-H3)
 tuner=52 - Thomson DDT 7610 (ATSC/NTSC)
 tuner=53 - Philips FQ1286
 tuner=54 - tda8290+75
-tuner=55 - LG PAL (TAPE series)
+tuner=55 - TCL 2002MB
 tuner=56 - Philips PAL/SECAM multi (FQ1216AME MK4)
 tuner=57 - Philips FQ1236A MK4
 tuner=58 - Ymec TVision TVF-8531MF/8831MF/8731MF
@@ -65,3 +65,6 @@ tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner
 tuner=64 - LG TDVS-H062F/TUA6034
 tuner=65 - Ymec TVF66T5-B/DFF
 tuner=66 - LG NTSC (TALN mini series)
+tuner=67 - Philips TD1316 Hybrid Tuner
+tuner=68 - Philips TUV1236D ATSC/NTSC dual in
+tuner=69 - Tena TNF 5335 MF
diff --git a/Documentation/video4linux/README.cx88 b/Documentation/video4linux/README.cx88
index 897ab834839a..06a33a4f52fd 100644
--- a/Documentation/video4linux/README.cx88
+++ b/Documentation/video4linux/README.cx88
@@ -17,9 +17,9 @@ audio
        - The chip specs for the on-chip TV sound decoder are next
          to useless :-/
        - Neverless the builtin TV sound decoder starts working now,
-          at least for PAL-BG.  Other TV norms need other code ...
+          at least for PAL-BG.  Other TV norms need other code ...
-          FOR ANY REPORTS ON THIS PLEASE MENTION THE TV NORM YOU ARE
+          FOR ANY REPORTS ON THIS PLEASE MENTION THE TV NORM YOU ARE
-          USING.
+          USING.
        - Most tuner chips do provide mono sound, which may or may not
          be useable depending on the board design.  With the Hauppauge
          cards it works, so there is mono sound available as fallback.
@@ -65,5 +65,5 @@ Have fun,
  Gerd
-- 
+--
 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
diff --git a/Documentation/video4linux/README.saa7134 b/Documentation/video4linux/README.saa7134
index 1f788e498eff..b911f0871874 100644
--- a/Documentation/video4linux/README.saa7134
+++ b/Documentation/video4linux/README.saa7134
@@ -78,5 +78,5 @@ Have fun,
  Gerd
-- 
+--
 Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]
diff --git a/Documentation/video4linux/bttv/Cards b/Documentation/video4linux/bttv/Cards
index 8f1941ede4da..d3389655ad96 100644
--- a/Documentation/video4linux/bttv/Cards
+++ b/Documentation/video4linux/bttv/Cards
@@ -149,11 +149,11 @@ Lifeview Flyvideo Series:
  2) There is a print on the PCB:
      LR25       = Flyvideo (Zoran ZR36120, SAA7110A)
      LR26 Rev.N = Flyvideo II (Bt848)
-           Rev.O = Flyvideo II (Bt878)
+           Rev.O = Flyvideo II (Bt878)
      LR37 Rev.C = Flyvideo EZ (Capture only, ZR36120 + SAA7110)
      LR38 Rev.A1= Flyvideo II EZ (Bt848 capture only)
      LR50 Rev.Q = Flyvideo 98 (w/eeprom and PCI subsystem ID)
-           Rev.W = Flyvideo 98 (no eeprom)
+           Rev.W = Flyvideo 98 (no eeprom)
      LR51 Rev.E = Flyvideo 98 EZ (capture only)
      LR90       = Flyvideo 2000 (Bt878)
                   Flyvideo 2000S (Bt878) w/Stereo TV (Package incl. LR91 daughterboard)
@@ -163,7 +163,7 @@ Lifeview Flyvideo Series:
      LR136      = Flyvideo 2100/3100 (Low profile, SAA7130/SAA7134)
      LR137      = Flyvideo DV2000/DV3000 (SAA7130/SAA7134 + IEEE1394)
      LR138 Rev.C= Flyvideo 2000 (SAA7130)
-                or Flyvideo 3000 (SAA7134) w/Stereo TV
+                or Flyvideo 3000 (SAA7134) w/Stereo TV
                   These exist in variations w/FM and w/Remote sometimes denoted
                   by suffixes "FM" and "R".
  3) You have a laptop (miniPCI card):
@@ -197,7 +197,7 @@ Typhoon TV card series:
  50680 "TV Tuner Pal BG" (blue package)= Pixelview PV-BT878P+ (Rev 9B)
  50681 "TV Tuner PCI Pal I" (variant of 50680)
  50682 "TView TV/FM Tuner Pal BG"       = Flyvideo 98FM (LR50 Rev.Q)
-         Note: The package has a picture of CPH05x (which would be a real TView)
+         Note: The package has a picture of CPH05x (which would be a real TView)
  50683 "TV Tuner PCI SECAM" (variant of 50680)
  50684 "TV Tuner Pal BG"                = Pixelview 878TV(Rev.3D)
  50686 "TV Tuner"                       = KNC1 TV Station
@@ -418,9 +418,9 @@ Lifetec/Medion/Tevion/Aldi
 --------------------------
   LT9306/MD9306 = CPH061
   LT9415/MD9415 = LR90 Rev.F or Rev.G
-          MD9592 = Avermedia TVphone98 (PCI_ID=1461:0003), PCB-Rev=M168II-B (w/TDA9873H)
+          MD9592 = Avermedia TVphone98 (PCI_ID=1461:0003), PCB-Rev=M168II-B (w/TDA9873H)
-          MD9717 = KNC One (Rev D4, saa7134, FM1216 MK2 tuner)
+          MD9717 = KNC One (Rev D4, saa7134, FM1216 MK2 tuner)
-          MD5044 = KNC One (Rev D4, saa7134, FM1216ME MK3 tuner)
+          MD5044 = KNC One (Rev D4, saa7134, FM1216ME MK3 tuner)
 Modular Technologies (www.modulartech.com) UK
 ---------------------------------------------
@@ -453,10 +453,10 @@ Technisat
   Discos ADR PC-Karte ISA (no TV!)
   Discos ADR PC-Karte PCI (probably no TV?)
   Techni-PC-Sat (Sat. analog)
-         Rev 1.2 (zr36120, vpx3220, stv0030, saa5246, BSJE3-494A)
+         Rev 1.2 (zr36120, vpx3220, stv0030, saa5246, BSJE3-494A)
   Mediafocus I (zr36120/zr36125, drp3510, Sat. analog + ADR Radio)
   Mediafocus II (saa7146, Sat. analog)
-         SatADR Rev 2.1 (saa7146a, saa7113h, stv0056a, msp3400c, drp3510a, BSKE3-307A)
+         SatADR Rev 2.1 (saa7146a, saa7113h, stv0056a, msp3400c, drp3510a, BSKE3-307A)
   SkyStar 1 DVB  (AV7110) = Technotrend Premium
   SkyStar 2 DVB  (B2C2) (=Sky2PC)
diff --git a/Documentation/video4linux/bttv/README b/Documentation/video4linux/bttv/README
index a72f4c94fb0b..7ca2154c2bf5 100644
--- a/Documentation/video4linux/bttv/README
+++ b/Documentation/video4linux/bttv/README
@@ -42,9 +42,9 @@ bttv uses the PCI Subsystem ID to autodetect the card type.  lspci lists
 the Subsystem ID in the second line, looks like this:
 00:0a.0 Multimedia video controller: Brooktree Corporation Bt878 (rev 02)
-        Subsystem: Hauppauge computer works Inc. WinTV/GO
+        Subsystem: Hauppauge computer works Inc. WinTV/GO
-        Flags: bus master, medium devsel, latency 32, IRQ 5
+        Flags: bus master, medium devsel, latency 32, IRQ 5
-        Memory at e2000000 (32-bit, prefetchable) [size=4K]
+        Memory at e2000000 (32-bit, prefetchable) [size=4K]
 only bt878-based cards can have a subsystem ID (which does not mean
 that every card really has one).  bt848 cards can't have a Subsystem
diff --git a/Documentation/video4linux/bttv/README.freeze b/Documentation/video4linux/bttv/README.freeze
index 51f8d4379a94..4259dccc8287 100644
--- a/Documentation/video4linux/bttv/README.freeze
+++ b/Documentation/video4linux/bttv/README.freeze
@@ -27,9 +27,9 @@ information out of a register+stack dump printed by the kernel on
 protection faults (so-called "kernel oops").
 If you run into some kind of deadlock, you can try to dump a call trace
-for each process using sysrq-t (see Documentation/sysrq.txt).  ksymoops
+for each process using sysrq-t (see Documentation/sysrq.txt).
-will translate these dumps into kernel symbols too.  This way it is
+This way it is possible to figure where *exactly* some process in "D"
-possible to figure where *exactly* some process in "D" state is stuck.
+state is stuck.
 I've seen reports that bttv 0.7.x crashes whereas 0.8.x works rock solid
 for some people.  Thus probably a small buglet left somewhere in bttv
diff --git a/Documentation/video4linux/bttv/Sound-FAQ b/Documentation/video4linux/bttv/Sound-FAQ
index b8c9c2605ce2..1e6328f91083 100644
--- a/Documentation/video4linux/bttv/Sound-FAQ
+++ b/Documentation/video4linux/bttv/Sound-FAQ
@@ -61,8 +61,8 @@ line for your board.  The important fields are these two:
 struct tvcard
 {
        [ ... ]
-        u32 gpiomask;
+        u32 gpiomask;
-        u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
+        u32 audiomux[6]; /* Tuner, Radio, external, internal, mute, stereo */
 };
 gpiomask specifies which pins are used to control the audio mux chip.
@@ -126,11 +126,11 @@ muxsel          - video mux, input->registervalue mapping
 pll             - same as pll= insmod option
 tuner_type      - same as tuner= insmod option
 *_modulename    - hint whenever some card needs this or that audio
-                  module loaded to work properly.
+                  module loaded to work properly.
 has_radio       - whenever this TV card has a radio tuner.
 no_msp34xx      - "1" disables loading of msp3400.o module
-no_tda9875      - "1" disables loading of tda9875.o module 
+no_tda9875      - "1" disables loading of tda9875.o module
-needs_tvaudio   - set to "1" to load tvaudio.o module 
+needs_tvaudio   - set to "1" to load tvaudio.o module
 If some config item is specified both from the tvcards array and as
 insmod option, the insmod option takes precedence.
@@ -144,5 +144,5 @@ Good luck,
 PS: If you have a new working entry, mail it to me.
-- 
+--
 Gerd Knorr <kraxel@bytesex.org>
diff --git a/Documentation/video4linux/bttv/Tuners b/Documentation/video4linux/bttv/Tuners
index d18fbc70c0e0..0a371d349542 100644
--- a/Documentation/video4linux/bttv/Tuners
+++ b/Documentation/video4linux/bttv/Tuners
@@ -21,7 +21,7 @@ SAMSUNG Tuner identification: (e.g. TCPM9091PD27)
   J= NTSC-Japan
   L= Secam LL
   M= BG+I+DK
-   N= NTSC 
+   N= NTSC
   Q= BG+I+DK+LL
 [89]: ?
 [125]:
@@ -96,7 +96,7 @@ LG Innotek Tuner:
  TADC-H002F: NTSC (L,175/410?; 2-B, C-W+11, W+12-69)
  TADC-M201D: PAL D/K+B/G+I (L,143/425)  (sound control at I2C address 0xc8)
  TADC-T003F: NTSC Taiwan  (L,175/410?; 2-B, C-W+11, W+12-69)
-  Suffix: 
+  Suffix:
    P= Standard phono female socket
    D= IEC female socket
    F= F-connector
diff --git a/Documentation/video4linux/lifeview.txt b/Documentation/video4linux/lifeview.txt
index b07ea79c2b7e..05f9eb57aac9 100644
--- a/Documentation/video4linux/lifeview.txt
+++ b/Documentation/video4linux/lifeview.txt
@@ -10,33 +10,33 @@ bt878:
 ------------------------------------------------------------------------------
 saa7134:
-                /* LifeView FlyTV Platinum FM (LR214WF) */
+                /* LifeView FlyTV Platinum FM (LR214WF) */
-                /* "Peter Missel <peter.missel@onlinehome.de> */
+                /* "Peter Missel <peter.missel@onlinehome.de> */
-                .name           = "LifeView FlyTV Platinum FM",
+                .name           = "LifeView FlyTV Platinum FM",
-                /*      GP27    MDT2005 PB4 pin 10 */
+                /*      GP27    MDT2005 PB4 pin 10 */
-                /*      GP26    MDT2005 PB3 pin 9 */
+                /*      GP26    MDT2005 PB3 pin 9 */
-                /*      GP25    MDT2005 PB2 pin 8 */
+                /*      GP25    MDT2005 PB2 pin 8 */
-                /*      GP23    MDT2005 PB1 pin 7 */
+                /*      GP23    MDT2005 PB1 pin 7 */
-                /*      GP22    MDT2005 PB0 pin 6 */
+                /*      GP22    MDT2005 PB0 pin 6 */
-                /*      GP21    MDT2005 PB5 pin 11 */
+                /*      GP21    MDT2005 PB5 pin 11 */
-                /*      GP20    MDT2005 PB6 pin 12 */
+                /*      GP20    MDT2005 PB6 pin 12 */
-                /*      GP19    MDT2005 PB7 pin 13 */
+                /*      GP19    MDT2005 PB7 pin 13 */
-                /*      nc      MDT2005 PA3 pin 2 */
+                /*      nc      MDT2005 PA3 pin 2 */
-                /*      Remote  MDT2005 PA2 pin 1 */
+                /*      Remote  MDT2005 PA2 pin 1 */
-                /*      GP18    MDT2005 PA1 pin 18 */
+                /*      GP18    MDT2005 PA1 pin 18 */
-                /*      nc      MDT2005 PA0 pin 17 strap low */
+                /*      nc      MDT2005 PA0 pin 17 strap low */
-                /*      GP17    Strap "GP7"=High */
+                /*      GP17    Strap "GP7"=High */
-                /*      GP16    Strap "GP6"=High
+                /*      GP16    Strap "GP6"=High
-                                0=Radio 1=TV
+                                0=Radio 1=TV
-                                Drives SA630D ENCH1 and HEF4052 A1 pins
+                                Drives SA630D ENCH1 and HEF4052 A1 pins
-                                to do FM radio through SIF input */
+                                to do FM radio through SIF input */
-                /*      GP15    nc */
+                /*      GP15    nc */
-                /*      GP14    nc */
+                /*      GP14    nc */
-                /*      GP13    nc */
+                /*      GP13    nc */
-                /*      GP12    Strap "GP5" = High */
+                /*      GP12    Strap "GP5" = High */
-                /*      GP11    Strap "GP4" = High */
+                /*      GP11    Strap "GP4" = High */
-                /*      GP10    Strap "GP3" = High */
+                /*      GP10    Strap "GP3" = High */
-                /*      GP09    Strap "GP2" = Low */
+                /*      GP09    Strap "GP2" = Low */
-                /*      GP08    Strap "GP1" = Low */
+                /*      GP08    Strap "GP1" = Low */
-                /*      GP07.00 nc */
+                /*      GP07.00 nc */
diff --git a/Documentation/vm/hugetlbpage.txt b/Documentation/vm/hugetlbpage.txt
index 1b9bcd1fe98b..1ad9af1ca4d0 100644
--- a/Documentation/vm/hugetlbpage.txt
+++ b/Documentation/vm/hugetlbpage.txt
@@ -13,12 +13,13 @@ This optimization is more critical now as bigger and bigger physical memories
 Users can use the huge page support in Linux kernel by either using the mmap
 system call or standard SYSv shared memory system calls (shmget, shmat).
-First the Linux kernel needs to be built with CONFIG_HUGETLB_PAGE (present
+First the Linux kernel needs to be built with the CONFIG_HUGETLBFS
-under Processor types and feature)  and CONFIG_HUGETLBFS (present under file
+(present under "File systems") and CONFIG_HUGETLB_PAGE (selected
-system option on config menu) config options.
+automatically when CONFIG_HUGETLBFS is selected) configuration
+options.
 The kernel built with hugepage support should show the number of configured
-hugepages in the system by running the "cat /proc/meminfo" command.  
+hugepages in the system by running the "cat /proc/meminfo" command.
 /proc/meminfo also provides information about the total number of hugetlb
 pages configured in the kernel.  It also displays information about the
@@ -38,19 +39,19 @@ in the kernel.
 /proc/sys/vm/nr_hugepages indicates the current number of configured hugetlb
 pages in the kernel.  Super user can dynamically request more (or free some
-pre-configured) hugepages. 
+pre-configured) hugepages.
-The allocation( or deallocation) of hugetlb pages is posible only if there are
+The allocation (or deallocation) of hugetlb pages is possible only if there are
 enough physically contiguous free pages in system (freeing of hugepages is
-possible only if there are enough hugetlb pages free that can be transfered 
+possible only if there are enough hugetlb pages free that can be transfered
 back to regular memory pool).
 Pages that are used as hugetlb pages are reserved inside the kernel and can
-not be used for other purposes. 
+not be used for other purposes.
 Once the kernel with Hugetlb page support is built and running, a user can
 use either the mmap system call or shared memory system calls to start using
 the huge pages.  It is required that the system administrator preallocate
-enough memory for huge page purposes.  
+enough memory for huge page purposes.
 Use the following command to dynamically allocate/deallocate hugepages:
@@ -80,9 +81,9 @@ memory (huge pages) allowed for that filesystem (/mnt/huge). The size is
 rounded down to HPAGE_SIZE.  The option nr_inode sets the maximum number of
 inodes that /mnt/huge can use.  If the size or nr_inode options are not
 provided on command line then no limits are set.  For size and nr_inodes
-options, you can use [G|g]/[M|m]/[K|k] to represent giga/mega/kilo. For 
+options, you can use [G|g]/[M|m]/[K|k] to represent giga/mega/kilo. For
-example, size=2K has the same meaning as size=2048. An example is given at 
+example, size=2K has the same meaning as size=2048. An example is given at
-the end of this document. 
+the end of this document.
 read and write system calls are not supported on files that reside on hugetlb
 file systems.