110 files changed, 4948 insertions, 1850 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index a1a643272883..2214f123a976 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -104,6 +104,8 @@ cpuidle/
        - info on CPU_IDLE, CPU idle state management subsystem.
 cputopology.txt
        - documentation on how CPU topology info is exported via sysfs.
+crc32.txt
+        - brief tutorial on CRC computation
 cris/
        - directory with info about Linux on CRIS architecture.
 crypto/
diff --git a/Documentation/ABI/testing/sysfs-block-dm b/Documentation/ABI/testing/sysfs-block-dm
new file mode 100644
index 000000000000..87ca5691e29b
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-block-dm
@@ -0,0 +1,25 @@
+What:           /sys/block/dm-<num>/dm/name
+Date:           January 2009
+KernelVersion:  2.6.29
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device name.
+                Read-only string containing mapped device name.
+Users:          util-linux, device-mapper udev rules
+What:           /sys/block/dm-<num>/dm/uuid
+Date:           January 2009
+KernelVersion:  2.6.29
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device UUID.
+                Read-only string containing DM-UUID or empty string
+                if DM-UUID is not set.
+Users:          util-linux, device-mapper udev rules
+What:           /sys/block/dm-<num>/dm/suspended
+Date:           June 2009
+KernelVersion:  2.6.31
+Contact:        dm-devel@redhat.com
+Description:    Device-mapper device suspend state.
+                Contains the value 1 while the device is suspended.
+                Otherwise it contains 0. Read-only attribute.
+Users:          util-linux, device-mapper udev rules
diff --git a/Documentation/ABI/testing/sysfs-bus-rpmsg b/Documentation/ABI/testing/sysfs-bus-rpmsg
new file mode 100644
index 000000000000..189e419a5a2d
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-rpmsg
@@ -0,0 +1,75 @@
+What:           /sys/bus/rpmsg/devices/.../name
+Date:           June 2011
+KernelVersion:  3.3
+Contact:        Ohad Ben-Cohen <ohad@wizery.com>
+Description:
+                Every rpmsg device is a communication channel with a remote
+                processor. Channels are identified with a (textual) name,
+                which is maximum 32 bytes long (defined as RPMSG_NAME_SIZE in
+                rpmsg.h).
+                This sysfs entry contains the name of this channel.
+What:           /sys/bus/rpmsg/devices/.../src
+Date:           June 2011
+KernelVersion:  3.3
+Contact:        Ohad Ben-Cohen <ohad@wizery.com>
+Description:
+                Every rpmsg device is a communication channel with a remote
+                processor. Channels have a local ("source") rpmsg address,
+                and remote ("destination") rpmsg address. When an entity
+                starts listening on one end of a channel, it assigns it with
+                a unique rpmsg address (a 32 bits integer). This way when
+                inbound messages arrive to this address, the rpmsg core
+                dispatches them to the listening entity (a kernel driver).
+                This sysfs entry contains the src (local) rpmsg address
+                of this channel. If it contains 0xffffffff, then an address
+                wasn't assigned (can happen if no driver exists for this
+                channel).
+What:           /sys/bus/rpmsg/devices/.../dst
+Date:           June 2011
+KernelVersion:  3.3
+Contact:        Ohad Ben-Cohen <ohad@wizery.com>
+Description:
+                Every rpmsg device is a communication channel with a remote
+                processor. Channels have a local ("source") rpmsg address,
+                and remote ("destination") rpmsg address. When an entity
+                starts listening on one end of a channel, it assigns it with
+                a unique rpmsg address (a 32 bits integer). This way when
+                inbound messages arrive to this address, the rpmsg core
+                dispatches them to the listening entity.
+                This sysfs entry contains the dst (remote) rpmsg address
+                of this channel. If it contains 0xffffffff, then an address
+                wasn't assigned (can happen if the kernel driver that
+                is attached to this channel is exposing a service to the
+                remote processor. This make it a local rpmsg server,
+                and it is listening for inbound messages that may be sent
+                from any remote rpmsg client; it is not bound to a single
+                remote entity).
+What:           /sys/bus/rpmsg/devices/.../announce
+Date:           June 2011
+KernelVersion:  3.3
+Contact:        Ohad Ben-Cohen <ohad@wizery.com>
+Description:
+                Every rpmsg device is a communication channel with a remote
+                processor. Channels are identified by a textual name (see
+                /sys/bus/rpmsg/devices/.../name above) and have a local
+                ("source") rpmsg address, and remote ("destination") rpmsg
+                address.
+                A channel is first created when an entity, whether local
+                or remote, starts listening on it for messages (and is thus
+                called an rpmsg server).
+                When that happens, a "name service" announcement is sent
+                to the other processor, in order to let it know about the
+                creation of the channel (this way remote clients know they
+                can start sending messages).
+                This sysfs entry tells us whether the channel is a local
+                server channel that is announced (values are either
+                true or false).
diff --git a/Documentation/ABI/testing/sysfs-driver-samsung-laptop b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
index e82e7c2b8f80..678819a3f8bf 100644
--- a/Documentation/ABI/testing/sysfs-driver-samsung-laptop
+++ b/Documentation/ABI/testing/sysfs-driver-samsung-laptop
@@ -17,3 +17,21 @@ Description:	Some Samsung laptops have different "performance levels"
                Specifically, not all support the "overclock" option,
                and it's still unknown if this value even changes
                anything, other than making the user feel a bit better.
+What:           /sys/devices/platform/samsung/battery_life_extender
+Date:           December 1, 2011
+KernelVersion:  3.3
+Contact:        Corentin Chary <corentin.chary@gmail.com>
+Description:    Max battery charge level can be modified, battery cycle
+                life can be extended by reducing the max battery charge
+                level.
+                0 means normal battery mode (100% charge)
+                1 means battery life extender mode (80% charge)
+What:           /sys/devices/platform/samsung/usb_charge
+Date:           December 1, 2011
+KernelVersion:  3.3
+Contact:        Corentin Chary <corentin.chary@gmail.com>
+Description:    Use your USB ports to charge devices, even
+                when your laptop is powered off.
+                1 means enabled, 0 means disabled.
diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-cleancache b/Documentation/ABI/testing/sysfs-kernel-mm-cleancache
deleted file mode 100644
index 662ae646ea12..000000000000
--- a/Documentation/ABI/testing/sysfs-kernel-mm-cleancache
+++ /dev/null
@@ -1,11 +0,0 @@
-What:           /sys/kernel/mm/cleancache/
-Date:           April 2011
-Contact:        Dan Magenheimer <dan.magenheimer@oracle.com>
-Description:
-                /sys/kernel/mm/cleancache/ contains a number of files which
-                record a count of various cleancache operations
-                (sum across all filesystems):
-                        succ_gets
-                        failed_gets
-                        puts
-                        flushes
diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl
index d71b57fcf116..4ee4ba3509fc 100644
--- a/Documentation/DocBook/kgdb.tmpl
+++ b/Documentation/DocBook/kgdb.tmpl
@@ -362,6 +362,23 @@
   </para>
  </para>
  </sect1>
+   <sect1 id="kgdbreboot">
+   <title>Run time parameter: kgdbreboot</title>
+   <para> The kgdbreboot feature allows you to change how the debugger
+   deals with the reboot notification.  You have 3 choices for the
+   behavior.  The default behavior is always set to 0.</para>
+   <orderedlist>
+   <listitem><para>echo -1 > /sys/module/debug_core/parameters/kgdbreboot</para>
+   <para>Ignore the reboot notification entirely.</para>
+   </listitem>
+   <listitem><para>echo 0 > /sys/module/debug_core/parameters/kgdbreboot</para>
+   <para>Send the detach message to any attached debugger client.</para>
+   </listitem>
+   <listitem><para>echo 1 > /sys/module/debug_core/parameters/kgdbreboot</para>
+   <para>Enter the debugger on reboot notify.</para>
+   </listitem>
+   </orderedlist>
+  </sect1>
  </chapter>
  <chapter id="usingKDB">
  <title>Using kdb</title>
diff --git a/Documentation/DocBook/media/v4l/biblio.xml b/Documentation/DocBook/media/v4l/biblio.xml
index cea6fd3ed428..7dc65c592a87 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -128,6 +128,26 @@ url="http://www.ijg.org">http://www.ijg.org</ulink>)</corpauthor>
      <subtitle>Version 1.02</subtitle>
    </biblioentry>
+    <biblioentry id="itu-t81">
+      <abbrev>ITU-T.81</abbrev>
+      <authorgroup>
+        <corpauthor>International Telecommunication Union
+(<ulink url="http://www.itu.int">http://www.itu.int</ulink>)</corpauthor>
+      </authorgroup>
+      <title>ITU-T Recommendation T.81
+"Information Technology &mdash; Digital Compression and Coding of Continous-Tone
+Still Images &mdash; Requirements and Guidelines"</title>
+    </biblioentry>
+    <biblioentry id="w3c-jpeg-jfif">
+      <abbrev>W3C JPEG JFIF</abbrev>
+      <authorgroup>
+        <corpauthor>The World Wide Web Consortium (<ulink
+url="http://www.w3.org/Graphics/JPEG">http://www.w3.org</ulink>)</corpauthor>
+      </authorgroup>
+      <title>JPEG JFIF</title>
+    </biblioentry>
    <biblioentry id="smpte12m">
      <abbrev>SMPTE&nbsp;12M</abbrev>
      <authorgroup>
diff --git a/Documentation/DocBook/media/v4l/compat.xml b/Documentation/DocBook/media/v4l/compat.xml
index a2485b3ff3d2..bce97c50391b 100644
--- a/Documentation/DocBook/media/v4l/compat.xml
+++ b/Documentation/DocBook/media/v4l/compat.xml
@@ -2393,6 +2393,20 @@ details.</para>
            to the <link linkend="control">User controls class</link>.
          </para>
        </listitem>
+        <listitem>
+          <para>Added the device_caps field to struct v4l2_capabilities and added the new
+          V4L2_CAP_DEVICE_CAPS capability.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section>
+      <title>V4L2 in Linux 3.4</title>
+      <orderedlist>
+        <listitem>
+          <para>Added <link linkend="jpeg-controls">JPEG compression control
+          class</link>.</para>
+        </listitem>
      </orderedlist>
    </section>
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml
index a1be37897ad7..b84f25e9cc87 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -1286,6 +1286,49 @@ produce a slight hiss, but in the encoder itself, guaranteeing a fixed
 and reproducible audio bitstream. 0 = unmuted, 1 = muted.</entry>
              </row>
              <row><entry></entry></row>
+              <row id="v4l2-mpeg-audio-dec-playback">
+                <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_DEC_PLAYBACK</constant>&nbsp;</entry>
+                <entry>enum&nbsp;v4l2_mpeg_audio_dec_playback</entry>
+              </row><row><entry spanname="descr">Determines how monolingual audio should be played back.
+Possible values are:</entry>
+              </row>
+              <row>
+                <entrytbl spanname="descr" cols="2">
+                  <tbody valign="top">
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_AUTO</constant>&nbsp;</entry>
+                      <entry>Automatically determines the best playback mode.</entry>
+                    </row>
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_STEREO</constant>&nbsp;</entry>
+                      <entry>Stereo playback.</entry>
+                    </row>
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_LEFT</constant>&nbsp;</entry>
+                      <entry>Left channel playback.</entry>
+                    </row>
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_RIGHT</constant>&nbsp;</entry>
+                      <entry>Right channel playback.</entry>
+                    </row>
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_MONO</constant>&nbsp;</entry>
+                      <entry>Mono playback.</entry>
+                    </row>
+                    <row>
+                      <entry><constant>V4L2_MPEG_AUDIO_DEC_PLAYBACK_SWAPPED_STEREO</constant>&nbsp;</entry>
+                      <entry>Stereo playback with swapped left and right channels.</entry>
+                    </row>
+                  </tbody>
+                </entrytbl>
+              </row>
+              <row><entry></entry></row>
+              <row id="v4l2-mpeg-audio-dec-multilingual-playback">
+                <entry spanname="id"><constant>V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK</constant>&nbsp;</entry>
+                <entry>enum&nbsp;v4l2_mpeg_audio_dec_playback</entry>
+              </row><row><entry spanname="descr">Determines how multilingual audio should be played back.</entry>
+              </row>
+              <row><entry></entry></row>
              <row id="v4l2-mpeg-video-encoding">
                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_ENCODING</constant>&nbsp;</entry>
                <entry>enum&nbsp;v4l2_mpeg_video_encoding</entry>
@@ -1447,6 +1490,22 @@ of the video. The supplied 32-bit integer is interpreted as follows (bit
                  </tbody>
                </entrytbl>
              </row>
+              <row><entry></entry></row>
+              <row id="v4l2-mpeg-video-dec-pts">
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_DEC_PTS</constant>&nbsp;</entry>
+                <entry>integer64</entry>
+              </row><row><entry spanname="descr">This read-only control returns the
+33-bit video Presentation Time Stamp as defined in ITU T-REC-H.222.0 and ISO/IEC 13818-1 of
+the currently displayed frame. This is the same PTS as is used in &VIDIOC-DECODER-CMD;.</entry>
+              </row>
+              <row><entry></entry></row>
+              <row id="v4l2-mpeg-video-dec-frame">
+                <entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_DEC_FRAME</constant>&nbsp;</entry>
+                <entry>integer64</entry>
+              </row><row><entry spanname="descr">This read-only control returns the
+frame counter of the frame that is currently displayed (decoded). This value is reset to 0 whenever
+the decoder is started.</entry>
+              </row>
              <row><entry></entry></row>
@@ -3377,6 +3436,167 @@ interface and may change in the future.</para>
        </tbody>
      </tgroup>
      </table>
+    </section>
+    <section id="jpeg-controls">
+      <title>JPEG Control Reference</title>
+      <para>The JPEG class includes controls for common features of JPEG
+      encoders and decoders. Currently it includes features for codecs
+      implementing progressive baseline DCT compression process with
+      Huffman entrophy coding.</para>
+      <table pgwide="1" frame="none" id="jpeg-control-id">
+      <title>JPEG Control IDs</title>
+      <tgroup cols="4">
+        <colspec colname="c1" colwidth="1*" />
+        <colspec colname="c2" colwidth="6*" />
+        <colspec colname="c3" colwidth="2*" />
+        <colspec colname="c4" colwidth="6*" />
+        <spanspec namest="c1" nameend="c2" spanname="id" />
+        <spanspec namest="c2" nameend="c4" spanname="descr" />
+        <thead>
+          <row>
+            <entry spanname="id" align="left">ID</entry>
+            <entry align="left">Type</entry>
+          </row><row rowsep="1"><entry spanname="descr" align="left">Description</entry>
+          </row>
+        </thead>
+        <tbody valign="top">
+          <row><entry></entry></row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_JPEG_CLASS</constant>&nbsp;</entry>
+            <entry>class</entry>
+          </row><row><entry spanname="descr">The JPEG class descriptor. Calling
+          &VIDIOC-QUERYCTRL; for this control will return a description of this
+          control class.
+        </entry>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_JPEG_CHROMA_SUBSAMPLING</constant></entry>
+            <entry>menu</entry>
+          </row>
+          <row id="jpeg-chroma-subsampling-control">
+            <entry spanname="descr">The chroma subsampling factors describe how
+            each component of an input image is sampled, in respect to maximum
+            sample rate in each spatial dimension. See <xref linkend="itu-t81"/>,
+            clause A.1.1. for more details. The <constant>
+            V4L2_CID_JPEG_CHROMA_SUBSAMPLING</constant> control determines how
+            Cb and Cr components are downsampled after coverting an input image
+            from RGB to Y'CbCr color space.
+            </entry>
+          </row>
+          <row>
+            <entrytbl spanname="descr" cols="2">
+              <tbody valign="top">
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_444</constant>
+                  </entry><entry>No chroma subsampling, each pixel has
+                  Y, Cr and Cb values.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_422</constant>
+                  </entry><entry>Horizontally subsample Cr, Cb components
+                  by a factor of 2.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_420</constant>
+                  </entry><entry>Subsample Cr, Cb components horizontally
+                  and vertically by 2.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_411</constant>
+                  </entry><entry>Horizontally subsample Cr, Cb components
+                  by a factor of 4.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_410</constant>
+                  </entry><entry>Subsample Cr, Cb components horizontally
+                  by 4 and vertically by 2.</entry>
+                </row>
+                <row>
+                  <entry><constant>V4L2_JPEG_CHROMA_SUBSAMPLING_GRAY</constant>
+                  </entry><entry>Use only luminance component.</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+          <row>
+            <entry spanname="id"><constant>V4L2_CID_JPEG_RESTART_INTERVAL</constant>
+            </entry><entry>integer</entry>
+          </row>
+          <row><entry spanname="descr">
+              The restart interval determines an interval of inserting RSTm
+              markers (m = 0..7). The purpose of these markers is to additionally
+              reinitialize the encoder process, in order to process blocks of
+              an image independently.
+              For the lossy compression processes the restart interval unit is
+              MCU (Minimum Coded Unit) and its value is contained in DRI
+              (Define Restart Interval) marker. If <constant>
+              V4L2_CID_JPEG_RESTART_INTERVAL</constant> control is set to 0,
+              DRI and RSTm markers will not be inserted.
+            </entry>
+          </row>
+          <row id="jpeg-quality-control">
+            <entry spanname="id"><constant>V4L2_CID_JPEG_COMPRESION_QUALITY</constant></entry>
+            <entry>integer</entry>
+          </row>
+          <row>
+            <entry spanname="descr">
+              <constant>V4L2_CID_JPEG_COMPRESION_QUALITY</constant> control
+              determines trade-off between image quality and size.
+              It provides simpler method for applications to control image quality,
+              without a need for direct reconfiguration of luminance and chrominance
+              quantization tables.
+              In cases where a driver uses quantization tables configured directly
+              by an application, using interfaces defined elsewhere, <constant>
+              V4L2_CID_JPEG_COMPRESION_QUALITY</constant> control should be set
+              by driver to 0.
+              <para>The value range of this control is driver-specific. Only
+              positive, non-zero values are meaningful. The recommended range
+              is 1 - 100, where larger values correspond to better image quality.
+              </para>
+            </entry>
+            </row>
+          <row id="jpeg-active-marker-control">
+            <entry spanname="id"><constant>V4L2_CID_JPEG_ACTIVE_MARKER</constant></entry>
+            <entry>bitmask</entry>
+          </row>
+          <row>
+            <entry spanname="descr">Specify which JPEG markers are included
+            in compressed stream. This control is valid only for encoders.
+            </entry>
+          </row>
+          <row>
+            <entrytbl spanname="descr" cols="2">
+              <tbody valign="top">
+                <row>
+                  <entry><constant>V4L2_JPEG_ACTIVE_MARKER_APP0</constant></entry>
+                  <entry>Application data segment APP<subscript>0</subscript>.</entry>
+                </row><row>
+                  <entry><constant>V4L2_JPEG_ACTIVE_MARKER_APP1</constant></entry>
+                  <entry>Application data segment APP<subscript>1</subscript>.</entry>
+                </row><row>
+                  <entry><constant>V4L2_JPEG_ACTIVE_MARKER_COM</constant></entry>
+                  <entry>Comment segment.</entry>
+                </row><row>
+                  <entry><constant>V4L2_JPEG_ACTIVE_MARKER_DQT</constant></entry>
+                  <entry>Quantization tables segment.</entry>
+                </row><row>
+                  <entry><constant>V4L2_JPEG_ACTIVE_MARKER_DHT</constant></entry>
+                  <entry>Huffman tables segment.</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+          <row><entry></entry></row>
+        </tbody>
+      </tgroup>
+      </table>
+      <para>For more details about JPEG specification, refer
+      to <xref linkend="itu-t81"/>, <xref linkend="jfif"/>,
+      <xref linkend="w3c-jpeg-jfif"/>.</para>
    </section>
 </section>
diff --git a/Documentation/DocBook/media/v4l/selection-api.xml b/Documentation/DocBook/media/v4l/selection-api.xml
index 2f0bdb4d5551..b299e4779354 100644
--- a/Documentation/DocBook/media/v4l/selection-api.xml
+++ b/Documentation/DocBook/media/v4l/selection-api.xml
@@ -52,6 +52,10 @@ cropping and composing rectangles have the same size.</para>
          </textobject>
        </mediaobject>
      </figure>
+For complete list of the available selection targets see table <xref
+linkend="v4l2-sel-target"/>
    </section>
  <section>
@@ -186,7 +190,7 @@ V4L2_SEL_TGT_COMPOSE_ACTIVE </constant> target.</para>
   <section>
-     <title>Scaling control.</title>
+     <title>Scaling control</title>
 <para>An application can detect if scaling is performed by comparing the width
 and the height of rectangles obtained using <constant> V4L2_SEL_TGT_CROP_ACTIVE
@@ -200,7 +204,7 @@ the scaling ratios using these values.</para>
  <section>
-    <title>Comparison with old cropping API.</title>
+    <title>Comparison with old cropping API</title>
 <para>The selection API was introduced to cope with deficiencies of previous
 <link linkend="crop"> API </link>, that was designed to control simple capture
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index e97c512861bb..8ae38876172e 100644
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -128,6 +128,22 @@ structs, ioctls) must be noted in more detail in the history chapter
 applications. -->
      <revision>
+        <revnumber>3.4</revnumber>
+        <date>2012-01-25</date>
+        <authorinitials>sn</authorinitials>
+        <revremark>Added <link linkend="jpeg-controls">JPEG compression
+            control class.</link>
+        </revremark>
+      </revision>
+      <revision>
+        <revnumber>3.3</revnumber>
+        <date>2012-01-11</date>
+        <authorinitials>hv</authorinitials>
+        <revremark>Added device_caps field to struct v4l2_capabilities.</revremark>
+      </revision>
+      <revision>
        <revnumber>3.2</revnumber>
        <date>2011-08-26</date>
        <authorinitials>hv</authorinitials>
@@ -417,7 +433,7 @@ and discussions on the V4L mailing list.</revremark>
 </partinfo>
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 3.2</subtitle>
+ <subtitle>Revision 3.3</subtitle>
  <chapter id="common">
    &sub-common;
@@ -473,6 +489,7 @@ and discussions on the V4L mailing list.</revremark>
    &sub-cropcap;
    &sub-dbg-g-chip-ident;
    &sub-dbg-g-register;
+    &sub-decoder-cmd;
    &sub-dqevent;
    &sub-encoder-cmd;
    &sub-enumaudio;
diff --git a/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml b/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml
new file mode 100644
index 000000000000..74b87f6e480a
--- /dev/null
+++ b/Documentation/DocBook/media/v4l/vidioc-decoder-cmd.xml
@@ -0,0 +1,256 @@
+<refentry id="vidioc-decoder-cmd">
+  <refmeta>
+    <refentrytitle>ioctl VIDIOC_DECODER_CMD, VIDIOC_TRY_DECODER_CMD</refentrytitle>
+    &manvol;
+  </refmeta>
+  <refnamediv>
+    <refname>VIDIOC_DECODER_CMD</refname>
+    <refname>VIDIOC_TRY_DECODER_CMD</refname>
+    <refpurpose>Execute an decoder command</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <funcsynopsis>
+      <funcprototype>
+        <funcdef>int <function>ioctl</function></funcdef>
+        <paramdef>int <parameter>fd</parameter></paramdef>
+        <paramdef>int <parameter>request</parameter></paramdef>
+        <paramdef>struct v4l2_decoder_cmd *<parameter>argp</parameter></paramdef>
+      </funcprototype>
+    </funcsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>Arguments</title>
+    <variablelist>
+      <varlistentry>
+        <term><parameter>fd</parameter></term>
+        <listitem>
+          <para>&fd;</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>request</parameter></term>
+        <listitem>
+          <para>VIDIOC_DECODER_CMD, VIDIOC_TRY_DECODER_CMD</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>argp</parameter></term>
+        <listitem>
+          <para></para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>Description</title>
+    <note>
+      <title>Experimental</title>
+      <para>This is an <link linkend="experimental">experimental</link>
+interface and may change in the future.</para>
+    </note>
+    <para>These ioctls control an audio/video (usually MPEG-) decoder.
+<constant>VIDIOC_DECODER_CMD</constant> sends a command to the
+decoder, <constant>VIDIOC_TRY_DECODER_CMD</constant> can be used to
+try a command without actually executing it. To send a command applications
+must initialize all fields of a &v4l2-decoder-cmd; and call
+<constant>VIDIOC_DECODER_CMD</constant> or <constant>VIDIOC_TRY_DECODER_CMD</constant>
+with a pointer to this structure.</para>
+    <para>The <structfield>cmd</structfield> field must contain the
+command code. Some commands use the <structfield>flags</structfield> field for
+additional information.
+</para>
+    <para>A <function>write</function>() or &VIDIOC-STREAMON; call sends an implicit
+START command to the decoder if it has not been started yet.
+</para>
+    <para>A <function>close</function>() or &VIDIOC-STREAMOFF; call of a streaming
+file descriptor sends an implicit immediate STOP command to the decoder, and all
+buffered data is discarded.</para>
+    <para>These ioctls are optional, not all drivers may support
+them. They were introduced in Linux 3.3.</para>
+    <table pgwide="1" frame="none" id="v4l2-decoder-cmd">
+      <title>struct <structname>v4l2_decoder_cmd</structname></title>
+      <tgroup cols="5">
+        &cs-str;
+        <tbody valign="top">
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>cmd</structfield></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry>The decoder command, see <xref linkend="decoder-cmds" />.</entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>flags</structfield></entry>
+            <entry></entry>
+            <entry></entry>
+            <entry>Flags to go with the command. If no flags are defined for
+this command, drivers and applications must set this field to zero.</entry>
+          </row>
+          <row>
+            <entry>union</entry>
+            <entry>(anonymous)</entry>
+            <entry></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry>struct</entry>
+            <entry><structfield>start</structfield></entry>
+            <entry></entry>
+            <entry>Structure containing additional data for the
+<constant>V4L2_DEC_CMD_START</constant> command.</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__s32</entry>
+            <entry><structfield>speed</structfield></entry>
+            <entry>Playback speed and direction. The playback speed is defined as
+<structfield>speed</structfield>/1000 of the normal speed. So 1000 is normal playback.
+Negative numbers denote reverse playback, so -1000 does reverse playback at normal
+speed. Speeds -1, 0 and 1 have special meanings: speed 0 is shorthand for 1000
+(normal playback). A speed of 1 steps just one frame forward, a speed of -1 steps
+just one frame back.
+            </entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__u32</entry>
+            <entry><structfield>format</structfield></entry>
+            <entry>Format restrictions. This field is set by the driver, not the
+application. Possible values are <constant>V4L2_DEC_START_FMT_NONE</constant> if
+there are no format restrictions or <constant>V4L2_DEC_START_FMT_GOP</constant>
+if the decoder operates on full GOPs (<wordasword>Group Of Pictures</wordasword>).
+This is usually the case for reverse playback: the decoder needs full GOPs, which
+it can then play in reverse order. So to implement reverse playback the application
+must feed the decoder the last GOP in the video file, then the GOP before that, etc. etc.
+            </entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry>struct</entry>
+            <entry><structfield>stop</structfield></entry>
+            <entry></entry>
+            <entry>Structure containing additional data for the
+<constant>V4L2_DEC_CMD_STOP</constant> command.</entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__u64</entry>
+            <entry><structfield>pts</structfield></entry>
+            <entry>Stop playback at this <structfield>pts</structfield> or immediately
+if the playback is already past that timestamp. Leave to 0 if you want to stop after the
+last frame was decoded.
+            </entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry>struct</entry>
+            <entry><structfield>raw</structfield></entry>
+            <entry></entry>
+            <entry></entry>
+          </row>
+          <row>
+            <entry></entry>
+            <entry></entry>
+            <entry>__u32</entry>
+            <entry><structfield>data</structfield>[16]</entry>
+            <entry>Reserved for future extensions. Drivers and
+applications must set the array to zero.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+    <table pgwide="1" frame="none" id="decoder-cmds">
+      <title>Decoder Commands</title>
+      <tgroup cols="3">
+        &cs-def;
+        <tbody valign="top">
+          <row>
+            <entry><constant>V4L2_DEC_CMD_START</constant></entry>
+            <entry>0</entry>
+            <entry>Start the decoder. When the decoder is already
+running or paused, this command will just change the playback speed.
+That means that calling <constant>V4L2_DEC_CMD_START</constant> when
+the decoder was paused will <emphasis>not</emphasis> resume the decoder.
+You have to explicitly call <constant>V4L2_DEC_CMD_RESUME</constant> for that.
+This command has one flag:
+<constant>V4L2_DEC_CMD_START_MUTE_AUDIO</constant>. If set, then audio will
+be muted when playing back at a non-standard speed.
+            </entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_DEC_CMD_STOP</constant></entry>
+            <entry>1</entry>
+            <entry>Stop the decoder. When the decoder is already stopped,
+this command does nothing. This command has two flags:
+if <constant>V4L2_DEC_CMD_STOP_TO_BLACK</constant> is set, then the decoder will
+set the picture to black after it stopped decoding. Otherwise the last image will
+repeat. If <constant>V4L2_DEC_CMD_STOP_IMMEDIATELY</constant> is set, then the decoder
+stops immediately (ignoring the <structfield>pts</structfield> value), otherwise it
+will keep decoding until timestamp >= pts or until the last of the pending data from
+its internal buffers was decoded.
+</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_DEC_CMD_PAUSE</constant></entry>
+            <entry>2</entry>
+            <entry>Pause the decoder. When the decoder has not been
+started yet, the driver will return an &EPERM;. When the decoder is
+already paused, this command does nothing. This command has one flag:
+if <constant>V4L2_DEC_CMD_PAUSE_TO_BLACK</constant> is set, then set the
+decoder output to black when paused.
+</entry>
+          </row>
+          <row>
+            <entry><constant>V4L2_DEC_CMD_RESUME</constant></entry>
+            <entry>3</entry>
+            <entry>Resume decoding after a PAUSE command. When the
+decoder has not been started yet, the driver will return an &EPERM;.
+When the decoder is already running, this command does nothing. No
+flags are defined for this command.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </refsect1>
+  <refsect1>
+    &return-value;
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>EINVAL</errorcode></term>
+        <listitem>
+          <para>The <structfield>cmd</structfield> field is invalid.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><errorcode>EPERM</errorcode></term>
+        <listitem>
+          <para>The application sent a PAUSE or RESUME command when
+the decoder was not running.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+</refentry>
diff --git a/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml b/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
index af7f3f2a36dd..f431b3ba79bd 100644
--- a/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-encoder-cmd.xml
@@ -74,15 +74,16 @@ only used by the STOP command and contains one bit: If the
 encoding will continue until the end of the current <wordasword>Group
 Of Pictures</wordasword>, otherwise it will stop immediately.</para>
-    <para>A <function>read</function>() call sends a START command to
+    <para>A <function>read</function>() or &VIDIOC-STREAMON; call sends an implicit
-the encoder if it has not been started yet. After a STOP command,
+START command to the encoder if it has not been started yet. After a STOP command,
 <function>read</function>() calls will read the remaining data
 buffered by the driver. When the buffer is empty,
 <function>read</function>() will return zero and the next
 <function>read</function>() call will restart the encoder.</para>
-    <para>A <function>close</function>() call sends an immediate STOP
+    <para>A <function>close</function>() or &VIDIOC-STREAMOFF; call of a streaming
-to the encoder, and all buffered data is discarded.</para>
+file descriptor sends an implicit immediate STOP to the encoder, and all buffered
+data is discarded.</para>
    <para>These ioctls are optional, not all drivers may support
 them. They were introduced in Linux 2.6.21.</para>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml b/Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
index 01ea24b84385..48748499c097 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-jpegcomp.xml
@@ -57,6 +57,11 @@
  <refsect1>
    <title>Description</title>
+    <para>These ioctls are <emphasis role="bold">deprecated</emphasis>.
+    New drivers and applications should use <link linkend="jpeg-controls">
+    JPEG class controls</link> for image quality and JPEG markers control.
+    </para>
    <para>[to do]</para>
    <para>Ronald Bultje elaborates:</para>
@@ -86,7 +91,10 @@ to add them.</para>
          <row>
            <entry>int</entry>
            <entry><structfield>quality</structfield></entry>
-            <entry></entry>
+            <entry>Deprecated. If <link linkend="jpeg-quality-control"><constant>
+            V4L2_CID_JPEG_IMAGE_QUALITY</constant></link> control is exposed by
+            a driver applications should use it instead and ignore this field.
+            </entry>
          </row>
          <row>
            <entry>int</entry>
@@ -116,7 +124,11 @@ to add them.</para>
          <row>
            <entry>__u32</entry>
            <entry><structfield>jpeg_markers</structfield></entry>
-            <entry>See <xref linkend="jpeg-markers" />.</entry>
+            <entry>See <xref linkend="jpeg-markers"/>. Deprecated.
+            If <link linkend="jpeg-active-marker-control"><constant>
+            V4L2_CID_JPEG_ACTIVE_MARKER</constant></link> control
+            is exposed by a driver applications should use it instead
+            and ignore this field.</entry>
          </row>
        </tbody>
      </tgroup>
diff --git a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
index a9d36e0c090e..bb04eff75f45 100644
--- a/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-g-selection.xml
@@ -58,43 +58,43 @@
    <para>The ioctls are used to query and configure selection rectangles.</para>
-<para> To query the cropping (composing) rectangle set <structfield>
+<para> To query the cropping (composing) rectangle set &v4l2-selection;
-&v4l2-selection;::type </structfield> to the respective buffer type.  Do not
+<structfield> type </structfield> field to the respective buffer type.
-use multiplanar buffers.  Use <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE
+Do not use multiplanar buffers.  Use <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE
 </constant> instead of <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE
 </constant>.  Use <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT </constant> instead of
 <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE </constant>.  The next step is
-setting <structfield> &v4l2-selection;::target </structfield> to value
+setting the value of &v4l2-selection; <structfield>target</structfield> field
-<constant> V4L2_SEL_TGT_CROP_ACTIVE </constant> (<constant>
+to <constant> V4L2_SEL_TGT_CROP_ACTIVE </constant> (<constant>
 V4L2_SEL_TGT_COMPOSE_ACTIVE </constant>).  Please refer to table <xref
 linkend="v4l2-sel-target" /> or <xref linkend="selection-api" /> for additional
-targets.  Fields <structfield> &v4l2-selection;::flags </structfield> and
+targets.  The <structfield>flags</structfield> and <structfield>reserved
-<structfield> &v4l2-selection;::reserved </structfield> are ignored and they
+</structfield> fields of &v4l2-selection; are ignored and they must be filled
-must be filled with zeros.  The driver fills the rest of the structure or
+with zeros.  The driver fills the rest of the structure or
 returns &EINVAL; if incorrect buffer type or target was used. If cropping
 (composing) is not supported then the active rectangle is not mutable and it is
-always equal to the bounds rectangle.  Finally, structure <structfield>
+always equal to the bounds rectangle.  Finally, the &v4l2-rect;
-&v4l2-selection;::r </structfield> is filled with the current cropping
+<structfield>r</structfield> rectangle is filled with the current cropping
 (composing) coordinates. The coordinates are expressed in driver-dependent
 units. The only exception are rectangles for images in raw formats, whose
 coordinates are always expressed in pixels.  </para>
-<para> To change the cropping (composing) rectangle set <structfield>
+<para> To change the cropping (composing) rectangle set the &v4l2-selection;
-&v4l2-selection;::type </structfield> to the respective buffer type.  Do not
+<structfield>type</structfield> field to the respective buffer type.  Do not
 use multiplanar buffers.  Use <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE
 </constant> instead of <constant> V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE
 </constant>.  Use <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT </constant> instead of
 <constant> V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE </constant>.  The next step is
-setting <structfield> &v4l2-selection;::target </structfield> to value
+setting the value of &v4l2-selection; <structfield>target</structfield> to
-<constant> V4L2_SEL_TGT_CROP_ACTIVE </constant> (<constant>
+<constant>V4L2_SEL_TGT_CROP_ACTIVE</constant> (<constant>
 V4L2_SEL_TGT_COMPOSE_ACTIVE </constant>). Please refer to table <xref
 linkend="v4l2-sel-target" /> or <xref linkend="selection-api" /> for additional
-targets.  Set desired active area into the field <structfield>
+targets.  The &v4l2-rect; <structfield>r</structfield> rectangle need to be
-&v4l2-selection;::r </structfield>.  Field <structfield>
+set to the desired active area. Field &v4l2-selection; <structfield> reserved
-&v4l2-selection;::reserved </structfield> is ignored and must be filled with
+</structfield> is ignored and must be filled with zeros.  The driver may adjust
-zeros.  The driver may adjust the rectangle coordinates. An application may
+coordinates of the requested rectangle. An application may
-introduce constraints to control rounding behaviour. Set the field
+introduce constraints to control rounding behaviour. The &v4l2-selection;
-<structfield> &v4l2-selection;::flags </structfield> to one of values:
+<structfield>flags</structfield> field must be set to one of the following:
 <itemizedlist>
  <listitem>
@@ -129,7 +129,7 @@ and vertical offset and sizes are chosen according to following priority:
 <orderedlist>
  <listitem>
-    <para>Satisfy constraints from <structfield>&v4l2-selection;::flags</structfield>.</para>
+    <para>Satisfy constraints from &v4l2-selection; <structfield>flags</structfield>.</para>
  </listitem>
  <listitem>
    <para>Adjust width, height, left, and top to hardware limits and alignments.</para>
@@ -145,7 +145,7 @@ and vertical offset and sizes are chosen according to following priority:
  </listitem>
 </orderedlist>
-On success the field <structfield> &v4l2-selection;::r </structfield> contains
+On success the &v4l2-rect; <structfield>r</structfield> field contains
 the adjusted rectangle. When the parameters are unsuitable the application may
 modify the cropping (composing) or image parameters and repeat the cycle until
 satisfactory parameters have been negotiated. If constraints flags have to be
@@ -162,38 +162,38 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
        <tbody valign="top">
          <row>
            <entry><constant>V4L2_SEL_TGT_CROP_ACTIVE</constant></entry>
-            <entry>0</entry>
+            <entry>0x0000</entry>
-            <entry>area that is currently cropped by hardware</entry>
+            <entry>The area that is currently cropped by hardware.</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_CROP_DEFAULT</constant></entry>
-            <entry>1</entry>
+            <entry>0x0001</entry>
-            <entry>suggested cropping rectangle that covers the "whole picture"</entry>
+            <entry>Suggested cropping rectangle that covers the "whole picture".</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_CROP_BOUNDS</constant></entry>
-            <entry>2</entry>
+            <entry>0x0002</entry>
-            <entry>limits for the cropping rectangle</entry>
+            <entry>Limits for the cropping rectangle.</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_COMPOSE_ACTIVE</constant></entry>
-            <entry>256</entry>
+            <entry>0x0100</entry>
-            <entry>area to which data are composed by hardware</entry>
+            <entry>The area to which data is composed by hardware.</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_COMPOSE_DEFAULT</constant></entry>
-            <entry>257</entry>
+            <entry>0x0101</entry>
-            <entry>suggested composing rectangle that covers the "whole picture"</entry>
+            <entry>Suggested composing rectangle that covers the "whole picture".</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_COMPOSE_BOUNDS</constant></entry>
-            <entry>258</entry>
+            <entry>0x0102</entry>
-            <entry>limits for the composing rectangle</entry>
+            <entry>Limits for the composing rectangle.</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_TGT_COMPOSE_PADDED</constant></entry>
-            <entry>259</entry>
+            <entry>0x0103</entry>
-            <entry>the active area and all padding pixels that are inserted or modified by the hardware</entry>
+            <entry>The active area and all padding pixels that are inserted or modified by hardware.</entry>
          </row>
        </tbody>
      </tgroup>
@@ -209,12 +209,14 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
          <row>
            <entry><constant>V4L2_SEL_FLAG_GE</constant></entry>
            <entry>0x00000001</entry>
-            <entry>indicate that adjusted rectangle must contain a rectangle from <structfield>&v4l2-selection;::r</structfield></entry>
+            <entry>Indicates that the adjusted rectangle must contain the original
+            &v4l2-selection; <structfield>r</structfield> rectangle.</entry>
          </row>
          <row>
            <entry><constant>V4L2_SEL_FLAG_LE</constant></entry>
            <entry>0x00000002</entry>
-            <entry>indicate that adjusted rectangle must be inside a rectangle from <structfield>&v4l2-selection;::r</structfield></entry>
+            <entry>Indicates that the adjusted rectangle must be inside the original
+            &v4l2-rect; <structfield>r</structfield> rectangle.</entry>
          </row>
        </tbody>
      </tgroup>
@@ -245,27 +247,29 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
          <row>
            <entry>__u32</entry>
            <entry><structfield>type</structfield></entry>
-            <entry>Type of the buffer (from &v4l2-buf-type;)</entry>
+            <entry>Type of the buffer (from &v4l2-buf-type;).</entry>
          </row>
          <row>
            <entry>__u32</entry>
            <entry><structfield>target</structfield></entry>
-            <entry>used to select between <link linkend="v4l2-sel-target"> cropping and composing rectangles </link></entry>
+            <entry>Used to select between <link linkend="v4l2-sel-target"> cropping
+            and composing rectangles</link>.</entry>
          </row>
          <row>
            <entry>__u32</entry>
            <entry><structfield>flags</structfield></entry>
-            <entry>control over coordinates adjustments, refer to <link linkend="v4l2-sel-flags">selection flags</link></entry>
+            <entry>Flags controlling the selection rectangle adjustments, refer to
+            <link linkend="v4l2-sel-flags">selection flags</link>.</entry>
          </row>
          <row>
            <entry>&v4l2-rect;</entry>
            <entry><structfield>r</structfield></entry>
-            <entry>selection rectangle</entry>
+            <entry>The selection rectangle.</entry>
          </row>
          <row>
            <entry>__u32</entry>
            <entry><structfield>reserved[9]</structfield></entry>
-            <entry>Reserved fields for future use</entry>
+            <entry>Reserved fields for future use.</entry>
          </row>
        </tbody>
      </tgroup>
@@ -278,24 +282,24 @@ exist no rectangle </emphasis> that satisfies the constraints.</para>
      <varlistentry>
        <term><errorcode>EINVAL</errorcode></term>
        <listitem>
-          <para>The buffer <structfield> &v4l2-selection;::type </structfield>
+          <para>Given buffer type <structfield>type</structfield> or
-or <structfield> &v4l2-selection;::target </structfield> is not supported, or
+the selection target <structfield>target</structfield> is not supported,
-the <structfield> &v4l2-selection;::flags </structfield> are invalid.</para>
+or the <structfield>flags</structfield> argument is not valid.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><errorcode>ERANGE</errorcode></term>
        <listitem>
-          <para>it is not possible to adjust a rectangle <structfield>
+          <para>It is not possible to adjust &v4l2-rect; <structfield>
-&v4l2-selection;::r </structfield> that satisfies all contraints from
+r</structfield> rectangle to satisfy all contraints given in the
-<structfield> &v4l2-selection;::flags </structfield>.</para>
+<structfield>flags</structfield> argument.</para>
        </listitem>
      </varlistentry>
      <varlistentry>
        <term><errorcode>EBUSY</errorcode></term>
        <listitem>
-          <para>it is not possible to apply change of selection rectangle at the moment.
+          <para>It is not possible to apply change of the selection rectangle
-Usually because streaming is in progress.</para>
+at the moment. Usually because streaming is in progress.</para>
        </listitem>
      </varlistentry>
    </variablelist>
diff --git a/Documentation/DocBook/media/v4l/vidioc-querycap.xml b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
index e3664d6f2de4..4643505cd4ca 100644
--- a/Documentation/DocBook/media/v4l/vidioc-querycap.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-querycap.xml
@@ -124,12 +124,35 @@ printf ("Version: %u.%u.%u\n",
          <row>
            <entry>__u32</entry>
            <entry><structfield>capabilities</structfield></entry>
-            <entry>Device capabilities, see <xref
+            <entry>Available capabilities of the physical device as a whole, see <xref
-                linkend="device-capabilities" />.</entry>
+                linkend="device-capabilities" />. The same physical device can export
+                multiple devices in /dev (e.g. /dev/videoX, /dev/vbiY and /dev/radioZ).
+                The <structfield>capabilities</structfield> field should contain a union
+                of all capabilities available around the several V4L2 devices exported
+                to userspace.
+                For all those devices the <structfield>capabilities</structfield> field
+                returns the same set of capabilities. This allows applications to open
+                just one of the devices (typically the video device) and discover whether
+                video, vbi and/or radio are also supported.
+            </entry>
          </row>
          <row>
            <entry>__u32</entry>
-            <entry><structfield>reserved</structfield>[4]</entry>
+            <entry><structfield>device_caps</structfield></entry>
+            <entry>Device capabilities of the opened device, see <xref
+                linkend="device-capabilities" />. Should contain the available capabilities
+                of that specific device node. So, for example, <structfield>device_caps</structfield>
+                of a radio device will only contain radio related capabilities and
+                no video or vbi capabilities. This field is only set if the <structfield>capabilities</structfield>
+                field contains the <constant>V4L2_CAP_DEVICE_CAPS</constant> capability.
+                Only the <structfield>capabilities</structfield> field can have the
+                <constant>V4L2_CAP_DEVICE_CAPS</constant> capability, <structfield>device_caps</structfield>
+                will never set <constant>V4L2_CAP_DEVICE_CAPS</constant>.
+            </entry>
+          </row>
+          <row>
+            <entry>__u32</entry>
+            <entry><structfield>reserved</structfield>[3]</entry>
            <entry>Reserved for future extensions. Drivers must set
 this array to zero.</entry>
          </row>
@@ -276,6 +299,13 @@ linkend="async">asynchronous</link> I/O methods.</entry>
            <entry>The device supports the <link
 linkend="mmap">streaming</link> I/O method.</entry>
          </row>
+          <row>
+            <entry><constant>V4L2_CAP_DEVICE_CAPS</constant></entry>
+            <entry>0x80000000</entry>
+            <entry>The driver fills the <structfield>device_caps</structfield>
+            field. This capability can only appear in the <structfield>capabilities</structfield>
+            field and never in the <structfield>device_caps</structfield> field.</entry>
+          </row>
        </tbody>
      </tgroup>
    </table>
diff --git a/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
index e013da845b11..18b1a8266f7c 100644
--- a/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
+++ b/Documentation/DocBook/media/v4l/vidioc-s-hw-freq-seek.xml
@@ -96,8 +96,8 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
          <row>
            <entry>__u32</entry>
            <entry><structfield>reserved</structfield>[7]</entry>
-            <entry>Reserved for future extensions. Drivers and
+            <entry>Reserved for future extensions. Applications
-            applications must set the array to zero.</entry>
+            must set the array to zero.</entry>
          </row>
        </tbody>
      </tgroup>
@@ -112,7 +112,7 @@ field and the &v4l2-tuner; <structfield>index</structfield> field.</entry>
        <term><errorcode>EINVAL</errorcode></term>
        <listitem>
          <para>The <structfield>tuner</structfield> index is out of
-bounds or the value in the <structfield>type</structfield> field is
+bounds, the wrap_around value is not supported or the value in the <structfield>type</structfield> field is
 wrong.</para>
        </listitem>
      </varlistentry>
diff --git a/Documentation/EDID/1024x768.S b/Documentation/EDID/1024x768.S
new file mode 100644
index 000000000000..4b486fe31b32
--- /dev/null
+++ b/Documentation/EDID/1024x768.S
@@ -0,0 +1,44 @@
+/*
+   1024x768.S: EDID data set for standard 1024x768 60 Hz monitor
+   Copyright (C) 2011 Carsten Emde <C.Emde@osadl.org>
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   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.
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+*/
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+/* Display */
+#define CLOCK 65000 /* kHz */
+#define XPIX 1024
+#define YPIX 768
+#define XY_RATIO XY_RATIO_4_3
+#define XBLANK 320
+#define YBLANK 38
+#define XOFFSET 8
+#define XPULSE 144
+#define YOFFSET (63+3)
+#define YPULSE (63+6)
+#define DPI 72
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "Linux XGA"
+#define ESTABLISHED_TIMINGS_BITS 0x08 /* Bit 3 -> 1024x768 @60 Hz */
+#define HSYNC_POL 0
+#define VSYNC_POL 0
+#define CRC 0x55
+#include "edid.S"
diff --git a/Documentation/EDID/1280x1024.S b/Documentation/EDID/1280x1024.S
new file mode 100644
index 000000000000..a2799fe33a4d
--- /dev/null
+++ b/Documentation/EDID/1280x1024.S
@@ -0,0 +1,44 @@
+/*
+   1280x1024.S: EDID data set for standard 1280x1024 60 Hz monitor
+   Copyright (C) 2011 Carsten Emde <C.Emde@osadl.org>
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   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.
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+*/
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+/* Display */
+#define CLOCK 108000 /* kHz */
+#define XPIX 1280
+#define YPIX 1024
+#define XY_RATIO XY_RATIO_5_4
+#define XBLANK 408
+#define YBLANK 42
+#define XOFFSET 48
+#define XPULSE 112
+#define YOFFSET (63+1)
+#define YPULSE (63+3)
+#define DPI 72
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "Linux SXGA"
+#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */
+#define HSYNC_POL 1
+#define VSYNC_POL 1
+#define CRC 0xa0
+#include "edid.S"
diff --git a/Documentation/EDID/1680x1050.S b/Documentation/EDID/1680x1050.S
new file mode 100644
index 000000000000..96f67cafcf2e
--- /dev/null
+++ b/Documentation/EDID/1680x1050.S
@@ -0,0 +1,44 @@
+/*
+   1680x1050.S: EDID data set for standard 1680x1050 60 Hz monitor
+   Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   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.
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+*/
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+/* Display */
+#define CLOCK 146250 /* kHz */
+#define XPIX 1680
+#define YPIX 1050
+#define XY_RATIO XY_RATIO_16_10
+#define XBLANK 560
+#define YBLANK 39
+#define XOFFSET 104
+#define XPULSE 176
+#define YOFFSET (63+3)
+#define YPULSE (63+6)
+#define DPI 96
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "Linux WSXGA"
+#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */
+#define HSYNC_POL 1
+#define VSYNC_POL 1
+#define CRC 0x26
+#include "edid.S"
diff --git a/Documentation/EDID/1920x1080.S b/Documentation/EDID/1920x1080.S
new file mode 100644
index 000000000000..36ed5d571d0a
--- /dev/null
+++ b/Documentation/EDID/1920x1080.S
@@ -0,0 +1,44 @@
+/*
+   1920x1080.S: EDID data set for standard 1920x1080 60 Hz monitor
+   Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   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.
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+*/
+/* EDID */
+#define VERSION 1
+#define REVISION 3
+/* Display */
+#define CLOCK 148500 /* kHz */
+#define XPIX 1920
+#define YPIX 1080
+#define XY_RATIO XY_RATIO_16_9
+#define XBLANK 280
+#define YBLANK 45
+#define XOFFSET 88
+#define XPULSE 44
+#define YOFFSET (63+4)
+#define YPULSE (63+5)
+#define DPI 96
+#define VFREQ 60 /* Hz */
+#define TIMING_NAME "Linux FHD"
+#define ESTABLISHED_TIMINGS_BITS 0x00 /* none */
+#define HSYNC_POL 1
+#define VSYNC_POL 1
+#define CRC 0x05
+#include "edid.S"
diff --git a/Documentation/EDID/HOWTO.txt b/Documentation/EDID/HOWTO.txt
new file mode 100644
index 000000000000..75a9f2a0c43d
--- /dev/null
+++ b/Documentation/EDID/HOWTO.txt
@@ -0,0 +1,39 @@
+In the good old days when graphics parameters were configured explicitly
+in a file called xorg.conf, even broken hardware could be managed.
+Today, with the advent of Kernel Mode Setting, a graphics board is
+either correctly working because all components follow the standards -
+or the computer is unusable, because the screen remains dark after
+booting or it displays the wrong area. Cases when this happens are:
+- The graphics board does not recognize the monitor.
+- The graphics board is unable to detect any EDID data.
+- The graphics board incorrectly forwards EDID data to the driver.
+- The monitor sends no or bogus EDID data.
+- A KVM sends its own EDID data instead of querying the connected monitor.
+Adding the kernel parameter "nomodeset" helps in most cases, but causes
+restrictions later on.
+As a remedy for such situations, the kernel configuration item
+CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an
+individually prepared or corrected EDID data set in the /lib/firmware
+directory from where it is loaded via the firmware interface. The code
+(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for
+commonly used screen resolutions (1024x768, 1280x1024, 1680x1050,
+1920x1080) as binary blobs, but the kernel source tree does not contain
+code to create these data. In order to elucidate the origin of the
+built-in binary EDID blobs and to facilitate the creation of individual
+data for a specific misbehaving monitor, commented sources and a
+Makefile environment are given here.
+To create binary EDID and C source code files from the existing data
+material, simply type "make".
+If you want to create your own EDID file, copy the file 1024x768.S and
+replace the settings with your own data. The CRC value in the last line
+  #define CRC 0x55
+is a bit tricky. After a first version of the binary data set is
+created, it must be be checked with the "edid-decode" utility which will
+most probably complain about a wrong CRC. Fortunately, the utility also
+displays the correct CRC which must then be inserted into the source
+file. After the make procedure is repeated, the EDID data set is ready
+to be used.
diff --git a/Documentation/EDID/Makefile b/Documentation/EDID/Makefile
new file mode 100644
index 000000000000..17763ca3f12b
--- /dev/null
+++ b/Documentation/EDID/Makefile
@@ -0,0 +1,26 @@
+SOURCES := $(wildcard [0-9]*x[0-9]*.S)
+BIN     := $(patsubst %.S, %.bin, $(SOURCES))
+IHEX    := $(patsubst %.S, %.bin.ihex, $(SOURCES))
+CODE    := $(patsubst %.S, %.c, $(SOURCES))
+all:    $(BIN) $(IHEX) $(CODE)
+clean:
+        @rm -f *.o *.bin.ihex *.bin *.c
+%.o:    %.S
+        @cc -c $^
+%.bin:  %.o
+        @objcopy -Obinary $^ $@
+%.bin.ihex:     %.o
+        @objcopy -Oihex $^ $@
+        @dos2unix $@ 2>/dev/null
+%.c:    %.bin
+        @echo "{" >$@; hexdump -f hex $^ >>$@; echo "};" >>$@
diff --git a/Documentation/EDID/edid.S b/Documentation/EDID/edid.S
new file mode 100644
index 000000000000..ea97ae275fca
--- /dev/null
+++ b/Documentation/EDID/edid.S
@@ -0,0 +1,261 @@
+/*
+   edid.S: EDID data template
+   Copyright (C) 2012 Carsten Emde <C.Emde@osadl.org>
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   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.
+   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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA.
+*/
+/* Manufacturer */
+#define MFG_LNX1 'L'
+#define MFG_LNX2 'N'
+#define MFG_LNX3 'X'
+#define SERIAL 0
+#define YEAR 2012
+#define WEEK 5
+/* EDID 1.3 standard definitions */
+#define XY_RATIO_16_10  0b00
+#define XY_RATIO_4_3    0b01
+#define XY_RATIO_5_4    0b10
+#define XY_RATIO_16_9   0b11
+#define mfgname2id(v1,v2,v3) \
+        ((((v1-'@')&0x1f)<<10)+(((v2-'@')&0x1f)<<5)+((v3-'@')&0x1f))
+#define swap16(v1) ((v1>>8)+((v1&0xff)<<8))
+#define msbs2(v1,v2) ((((v1>>8)&0x0f)<<4)+((v2>>8)&0x0f))
+#define msbs4(v1,v2,v3,v4) \
+        (((v1&0x03)>>2)+((v2&0x03)>>4)+((v3&0x03)>>6)+((v4&0x03)>>8))
+#define pixdpi2mm(pix,dpi) ((pix*25)/dpi)
+#define xsize pixdpi2mm(XPIX,DPI)
+#define ysize pixdpi2mm(YPIX,DPI)
+                .data
+/* Fixed header pattern */
+header:         .byte   0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00
+mfg_id:         .word   swap16(mfgname2id(MFG_LNX1, MFG_LNX2, MFG_LNX3))
+prod_code:      .word   0
+/* Serial number. 32 bits, little endian. */
+serial_number:  .long   SERIAL
+/* Week of manufacture */
+week:           .byte   WEEK
+/* Year of manufacture, less 1990. (1990-2245)
+   If week=255, it is the model year instead */
+year:           .byte   YEAR-1990
+version:        .byte   VERSION         /* EDID version, usually 1 (for 1.3) */
+revision:       .byte   REVISION        /* EDID revision, usually 3 (for 1.3) */
+/* If Bit 7=1   Digital input. If set, the following bit definitions apply:
+     Bits 6-1   Reserved, must be 0
+     Bit 0      Signal is compatible with VESA DFP 1.x TMDS CRGB,
+                  1 pixel per clock, up to 8 bits per color, MSB aligned,
+   If Bit 7=0   Analog input. If clear, the following bit definitions apply:
+     Bits 6-5   Video white and sync levels, relative to blank
+                  00=+0.7/-0.3 V; 01=+0.714/-0.286 V;
+                  10=+1.0/-0.4 V; 11=+0.7/0 V
+   Bit 4        Blank-to-black setup (pedestal) expected
+   Bit 3        Separate sync supported
+   Bit 2        Composite sync (on HSync) supported
+   Bit 1        Sync on green supported
+   Bit 0        VSync pulse must be serrated when somposite or
+                  sync-on-green is used. */
+video_parms:    .byte   0x6d
+/* Maximum horizontal image size, in centimetres
+   (max 292 cm/115 in at 16:9 aspect ratio) */
+max_hor_size:   .byte   xsize/10
+/* Maximum vertical image size, in centimetres.
+   If either byte is 0, undefined (e.g. projector) */
+max_vert_size:  .byte   ysize/10
+/* Display gamma, minus 1, times 100 (range 1.00-3.5 */
+gamma:          .byte   120
+/* Bit 7        DPMS standby supported
+   Bit 6        DPMS suspend supported
+   Bit 5        DPMS active-off supported
+   Bits 4-3     Display type: 00=monochrome; 01=RGB colour;
+                  10=non-RGB multicolour; 11=undefined
+   Bit 2        Standard sRGB colour space. Bytes 25-34 must contain
+                  sRGB standard values.
+   Bit 1        Preferred timing mode specified in descriptor block 1.
+   Bit 0        GTF supported with default parameter values. */
+dsp_features:   .byte   0xea
+/* Chromaticity coordinates. */
+/* Red and green least-significant bits
+   Bits 7-6     Red x value least-significant 2 bits
+   Bits 5-4     Red y value least-significant 2 bits
+   Bits 3-2     Green x value lst-significant 2 bits
+   Bits 1-0     Green y value least-significant 2 bits */
+red_green_lsb:  .byte   0x5e
+/* Blue and white least-significant 2 bits */
+blue_white_lsb: .byte   0xc0
+/* Red x value most significant 8 bits.
+   0-255 encodes 0-0.996 (255/256); 0-0.999 (1023/1024) with lsbits */
+red_x_msb:      .byte   0xa4
+/* Red y value most significant 8 bits */
+red_y_msb:      .byte   0x59
+/* Green x and y value most significant 8 bits */
+green_x_y_msb:  .byte   0x4a,0x98
+/* Blue x and y value most significant 8 bits */
+blue_x_y_msb:   .byte   0x25,0x20
+/* Default white point x and y value most significant 8 bits */
+white_x_y_msb:  .byte   0x50,0x54
+/* Established timings */
+/* Bit 7        720x400 @ 70 Hz
+   Bit 6        720x400 @ 88 Hz
+   Bit 5        640x480 @ 60 Hz
+   Bit 4        640x480 @ 67 Hz
+   Bit 3        640x480 @ 72 Hz
+   Bit 2        640x480 @ 75 Hz
+   Bit 1        800x600 @ 56 Hz
+   Bit 0        800x600 @ 60 Hz */
+estbl_timing1:  .byte   0x00
+/* Bit 7        800x600 @ 72 Hz
+   Bit 6        800x600 @ 75 Hz
+   Bit 5        832x624 @ 75 Hz
+   Bit 4        1024x768 @ 87 Hz, interlaced (1024x768)
+   Bit 3        1024x768 @ 60 Hz
+   Bit 2        1024x768 @ 72 Hz
+   Bit 1        1024x768 @ 75 Hz
+   Bit 0        1280x1024 @ 75 Hz */
+estbl_timing2:  .byte   ESTABLISHED_TIMINGS_BITS
+/* Bit 7        1152x870 @ 75 Hz (Apple Macintosh II)
+   Bits 6-0     Other manufacturer-specific display mod */
+estbl_timing3:  .byte   0x00
+/* Standard timing */
+/* X resolution, less 31, divided by 8 (256-2288 pixels) */
+std_xres:       .byte   (XPIX/8)-31
+/* Y resolution, X:Y pixel ratio
+   Bits 7-6     X:Y pixel ratio: 00=16:10; 01=4:3; 10=5:4; 11=16:9.
+   Bits 5-0     Vertical frequency, less 60 (60-123 Hz) */
+std_vres:       .byte   (XY_RATIO<<6)+VFREQ-60
+                .fill   7,2,0x0101      /* Unused */
+descriptor1:
+/* Pixel clock in 10 kHz units. (0.-655.35 MHz, little-endian) */
+clock:          .word   CLOCK/10
+/* Horizontal active pixels 8 lsbits (0-4095) */
+x_act_lsb:      .byte   XPIX&0xff
+/* Horizontal blanking pixels 8 lsbits (0-4095)
+   End of active to start of next active. */
+x_blk_lsb:      .byte   XBLANK&0xff
+/* Bits 7-4     Horizontal active pixels 4 msbits
+   Bits 3-0     Horizontal blanking pixels 4 msbits */
+x_msbs:         .byte   msbs2(XPIX,XBLANK)
+/* Vertical active lines 8 lsbits (0-4095) */
+y_act_lsb:      .byte   YPIX&0xff
+/* Vertical blanking lines 8 lsbits (0-4095) */
+y_blk_lsb:      .byte   YBLANK&0xff
+/* Bits 7-4     Vertical active lines 4 msbits
+   Bits 3-0     Vertical blanking lines 4 msbits */
+y_msbs:         .byte   msbs2(YPIX,YBLANK)
+/* Horizontal sync offset pixels 8 lsbits (0-1023) From blanking start */
+x_snc_off_lsb:  .byte   XOFFSET&0xff
+/* Horizontal sync pulse width pixels 8 lsbits (0-1023) */
+x_snc_pls_lsb:  .byte   XPULSE&0xff
+/* Bits 7-4     Vertical sync offset lines 4 lsbits -63)
+   Bits 3-0     Vertical sync pulse width lines 4 lsbits -63) */
+y_snc_lsb:      .byte   ((YOFFSET-63)<<4)+(YPULSE-63)
+/* Bits 7-6     Horizontal sync offset pixels 2 msbits
+   Bits 5-4     Horizontal sync pulse width pixels 2 msbits
+   Bits 3-2     Vertical sync offset lines 2 msbits
+   Bits 1-0     Vertical sync pulse width lines 2 msbits */
+xy_snc_msbs:    .byte   msbs4(XOFFSET,XPULSE,YOFFSET,YPULSE)
+/* Horizontal display size, mm, 8 lsbits (0-4095 mm, 161 in) */
+x_dsp_size:     .byte   xsize&0xff
+/* Vertical display size, mm, 8 lsbits (0-4095 mm, 161 in) */
+y_dsp_size:     .byte   ysize&0xff
+/* Bits 7-4     Horizontal display size, mm, 4 msbits
+   Bits 3-0     Vertical display size, mm, 4 msbits */
+dsp_size_mbsb:  .byte   msbs2(xsize,ysize)
+/* Horizontal border pixels (each side; total is twice this) */
+x_border:       .byte   0
+/* Vertical border lines (each side; total is twice this) */
+y_border:       .byte   0
+/* Bit 7        Interlaced
+   Bits 6-5     Stereo mode: 00=No stereo; other values depend on bit 0:
+   Bit 0=0: 01=Field sequential, sync=1 during right; 10=similar,
+     sync=1 during left; 11=4-way interleaved stereo
+   Bit 0=1 2-way interleaved stereo: 01=Right image on even lines;
+     10=Left image on even lines; 11=side-by-side
+   Bits 4-3     Sync type: 00=Analog composite; 01=Bipolar analog composite;
+     10=Digital composite (on HSync); 11=Digital separate
+   Bit 2        If digital separate: Vertical sync polarity (1=positive)
+   Other types: VSync serrated (HSync during VSync)
+   Bit 1        If analog sync: Sync on all 3 RGB lines (else green only)
+   Digital: HSync polarity (1=positive)
+   Bit 0        2-way line-interleaved stereo, if bits 4-3 are not 00. */
+features:       .byte   0x18+(VSYNC_POL<<2)+(HSYNC_POL<<1)
+descriptor2:    .byte   0,0     /* Not a detailed timing descriptor */
+                .byte   0       /* Must be zero */
+                .byte   0xff    /* Descriptor is monitor serial number (text) */
+                .byte   0       /* Must be zero */
+start1:         .ascii  "Linux #0"
+end1:           .byte   0x0a    /* End marker */
+                .fill   12-(end1-start1), 1, 0x20 /* Padded spaces */
+descriptor3:    .byte   0,0     /* Not a detailed timing descriptor */
+                .byte   0       /* Must be zero */
+                .byte   0xfd    /* Descriptor is monitor range limits */
+                .byte   0       /* Must be zero */
+start2:         .byte   VFREQ-1 /* Minimum vertical field rate (1-255 Hz) */
+                .byte   VFREQ+1 /* Maximum vertical field rate (1-255 Hz) */
+                .byte   (CLOCK/(XPIX+XBLANK))-1 /* Minimum horizontal line rate
+                                                    (1-255 kHz) */
+                .byte   (CLOCK/(XPIX+XBLANK))+1 /* Maximum horizontal line rate
+                                                    (1-255 kHz) */
+                .byte   (CLOCK/10000)+1 /* Maximum pixel clock rate, rounded up
+                                           to 10 MHz multiple (10-2550 MHz) */
+                .byte   0       /* No extended timing information type */
+end2:           .byte   0x0a    /* End marker */
+                .fill   12-(end2-start2), 1, 0x20 /* Padded spaces */
+descriptor4:    .byte   0,0     /* Not a detailed timing descriptor */
+                .byte   0       /* Must be zero */
+                .byte   0xfc    /* Descriptor is text */
+                .byte   0       /* Must be zero */
+start3:         .ascii  TIMING_NAME
+end3:           .byte   0x0a    /* End marker */
+                .fill   12-(end3-start3), 1, 0x20 /* Padded spaces */
+extensions:     .byte   0       /* Number of extensions to follow */
+checksum:       .byte   CRC     /* Sum of all bytes must be 0 */
diff --git a/Documentation/EDID/hex b/Documentation/EDID/hex
new file mode 100644
index 000000000000..8873ebb618af
--- /dev/null
+++ b/Documentation/EDID/hex
@@ -0,0 +1 @@
+"\t" 8/1 "0x%02x, " "\n"
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 9b4bc5c76f33..30b656ece7aa 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,3 +1,3 @@
 obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
        filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \
-        pcmcia/ spi/ timers/ vm/ watchdog/src/
+        pcmcia/ spi/ timers/ watchdog/src/
diff --git a/Documentation/backlight/lp855x-driver.txt b/Documentation/backlight/lp855x-driver.txt
new file mode 100644
index 000000000000..f5e4caafab7d
--- /dev/null
+++ b/Documentation/backlight/lp855x-driver.txt
@@ -0,0 +1,78 @@
+Kernel driver lp855x
+====================
+Backlight driver for LP855x ICs
+Supported chips:
+        Texas Instruments LP8550, LP8551, LP8552, LP8553 and LP8556
+Author: Milo(Woogyom) Kim <milo.kim@ti.com>
+Description
+-----------
+* Brightness control
+Brightness can be controlled by the pwm input or the i2c command.
+The lp855x driver supports both cases.
+* Device attributes
+1) bl_ctl_mode
+Backlight control mode.
+Value : pwm based or register based
+2) chip_id
+The lp855x chip id.
+Value : lp8550/lp8551/lp8552/lp8553/lp8556
+Platform data for lp855x
+------------------------
+For supporting platform specific data, the lp855x platform data can be used.
+* name : Backlight driver name. If it is not defined, default name is set.
+* mode : Brightness control mode. PWM or register based.
+* device_control : Value of DEVICE CONTROL register.
+* initial_brightness : Initial value of backlight brightness.
+* pwm_data : Platform specific pwm generation functions.
+             Only valid when brightness is pwm input mode.
+             Functions should be implemented by PWM driver.
+             - pwm_set_intensity() : set duty of PWM
+             - pwm_get_intensity() : get current duty of PWM
+* load_new_rom_data :
+        0 : use default configuration data
+        1 : update values of eeprom or eprom registers on loading driver
+* size_program : Total size of lp855x_rom_data.
+* rom_data : List of new eeprom/eprom registers.
+example 1) lp8552 platform data : i2c register mode with new eeprom data
+#define EEPROM_A5_ADDR  0xA5
+#define EEPROM_A5_VAL   0x4f    /* EN_VSYNC=0 */
+static struct lp855x_rom_data lp8552_eeprom_arr[] = {
+        {EEPROM_A5_ADDR, EEPROM_A5_VAL},
+};
+static struct lp855x_platform_data lp8552_pdata = {
+        .name = "lcd-bl",
+        .mode = REGISTER_BASED,
+        .device_control = I2C_CONFIG(LP8552),
+        .initial_brightness = INITIAL_BRT,
+        .load_new_rom_data = 1,
+        .size_program = ARRAY_SIZE(lp8552_eeprom_arr),
+        .rom_data = lp8552_eeprom_arr,
+};
+example 2) lp8556 platform data : pwm input mode with default rom data
+static struct lp855x_platform_data lp8556_pdata = {
+        .mode = PWM_BASED,
+        .device_control = PWM_CONFIG(LP8556),
+        .initial_brightness = INITIAL_BRT,
+        .pwm_data = {
+                     .pwm_set_intensity = platform_pwm_set_intensity,
+                     .pwm_get_intensity = platform_pwm_get_intensity,
+                     },
+};
diff --git a/Documentation/clk.txt b/Documentation/clk.txt
new file mode 100644
index 000000000000..1943fae014fd
--- /dev/null
+++ b/Documentation/clk.txt
@@ -0,0 +1,233 @@
+                The Common Clk Framework
+                Mike Turquette <mturquette@ti.com>
+This document endeavours to explain the common clk framework details,
+and how to port a platform over to this framework.  It is not yet a
+detailed explanation of the clock api in include/linux/clk.h, but
+perhaps someday it will include that information.
+        Part 1 - introduction and interface split
+The common clk framework is an interface to control the clock nodes
+available on various devices today.  This may come in the form of clock
+gating, rate adjustment, muxing or other operations.  This framework is
+enabled with the CONFIG_COMMON_CLK option.
+The interface itself is divided into two halves, each shielded from the
+details of its counterpart.  First is the common definition of struct
+clk which unifies the framework-level accounting and infrastructure that
+has traditionally been duplicated across a variety of platforms.  Second
+is a common implementation of the clk.h api, defined in
+drivers/clk/clk.c.  Finally there is struct clk_ops, whose operations
+are invoked by the clk api implementation.
+The second half of the interface is comprised of the hardware-specific
+callbacks registered with struct clk_ops and the corresponding
+hardware-specific structures needed to model a particular clock.  For
+the remainder of this document any reference to a callback in struct
+clk_ops, such as .enable or .set_rate, implies the hardware-specific
+implementation of that code.  Likewise, references to struct clk_foo
+serve as a convenient shorthand for the implementation of the
+hardware-specific bits for the hypothetical "foo" hardware.
+Tying the two halves of this interface together is struct clk_hw, which
+is defined in struct clk_foo and pointed to within struct clk.  This
+allows easy for navigation between the two discrete halves of the common
+clock interface.
+        Part 2 - common data structures and api
+Below is the common struct clk definition from
+include/linux/clk-private.h, modified for brevity:
+        struct clk {
+                const char              *name;
+                const struct clk_ops    *ops;
+                struct clk_hw           *hw;
+                char                    **parent_names;
+                struct clk              **parents;
+                struct clk              *parent;
+                struct hlist_head       children;
+                struct hlist_node       child_node;
+                ...
+        };
+The members above make up the core of the clk tree topology.  The clk
+api itself defines several driver-facing functions which operate on
+struct clk.  That api is documented in include/linux/clk.h.
+Platforms and devices utilizing the common struct clk use the struct
+clk_ops pointer in struct clk to perform the hardware-specific parts of
+the operations defined in clk.h:
+        struct clk_ops {
+                int             (*prepare)(struct clk_hw *hw);
+                void            (*unprepare)(struct clk_hw *hw);
+                int             (*enable)(struct clk_hw *hw);
+                void            (*disable)(struct clk_hw *hw);
+                int             (*is_enabled)(struct clk_hw *hw);
+                unsigned long   (*recalc_rate)(struct clk_hw *hw,
+                                                unsigned long parent_rate);
+                long            (*round_rate)(struct clk_hw *hw, unsigned long,
+                                                unsigned long *);
+                int             (*set_parent)(struct clk_hw *hw, u8 index);
+                u8              (*get_parent)(struct clk_hw *hw);
+                int             (*set_rate)(struct clk_hw *hw, unsigned long);
+                void            (*init)(struct clk_hw *hw);
+        };
+        Part 3 - hardware clk implementations
+The strength of the common struct clk comes from its .ops and .hw pointers
+which abstract the details of struct clk from the hardware-specific bits, and
+vice versa.  To illustrate consider the simple gateable clk implementation in
+drivers/clk/clk-gate.c:
+struct clk_gate {
+        struct clk_hw   hw;
+        void __iomem    *reg;
+        u8              bit_idx;
+        ...
+};
+struct clk_gate contains struct clk_hw hw as well as hardware-specific
+knowledge about which register and bit controls this clk's gating.
+Nothing about clock topology or accounting, such as enable_count or
+notifier_count, is needed here.  That is all handled by the common
+framework code and struct clk.
+Let's walk through enabling this clk from driver code:
+        struct clk *clk;
+        clk = clk_get(NULL, "my_gateable_clk");
+        clk_prepare(clk);
+        clk_enable(clk);
+The call graph for clk_enable is very simple:
+clk_enable(clk);
+        clk->ops->enable(clk->hw);
+        [resolves to...]
+                clk_gate_enable(hw);
+                [resolves struct clk gate with to_clk_gate(hw)]
+                        clk_gate_set_bit(gate);
+And the definition of clk_gate_set_bit:
+static void clk_gate_set_bit(struct clk_gate *gate)
+{
+        u32 reg;
+        reg = __raw_readl(gate->reg);
+        reg |= BIT(gate->bit_idx);
+        writel(reg, gate->reg);
+}
+Note that to_clk_gate is defined as:
+#define to_clk_gate(_hw) container_of(_hw, struct clk_gate, clk)
+This pattern of abstraction is used for every clock hardware
+representation.
+        Part 4 - supporting your own clk hardware
+When implementing support for a new type of clock it only necessary to
+include the following header:
+#include <linux/clk-provider.h>
+include/linux/clk.h is included within that header and clk-private.h
+must never be included from the code which implements the operations for
+a clock.  More on that below in Part 5.
+To construct a clk hardware structure for your platform you must define
+the following:
+struct clk_foo {
+        struct clk_hw hw;
+        ... hardware specific data goes here ...
+};
+To take advantage of your data you'll need to support valid operations
+for your clk:
+struct clk_ops clk_foo_ops {
+        .enable         = &clk_foo_enable;
+        .disable        = &clk_foo_disable;
+};
+Implement the above functions using container_of:
+#define to_clk_foo(_hw) container_of(_hw, struct clk_foo, hw)
+int clk_foo_enable(struct clk_hw *hw)
+{
+        struct clk_foo *foo;
+        foo = to_clk_foo(hw);
+        ... perform magic on foo ...
+        return 0;
+};
+Below is a matrix detailing which clk_ops are mandatory based upon the
+hardware capbilities of that clock.  A cell marked as "y" means
+mandatory, a cell marked as "n" implies that either including that
+callback is invalid or otherwise uneccesary.  Empty cells are either
+optional or must be evaluated on a case-by-case basis.
+                           clock hardware characteristics
+             -----------------------------------------------------------
+             | gate | change rate | single parent | multiplexer | root |
+             |------|-------------|---------------|-------------|------|
+.prepare     |      |             |               |             |      |
+.unprepare   |      |             |               |             |      |
+             |      |             |               |             |      |
+.enable      | y    |             |               |             |      |
+.disable     | y    |             |               |             |      |
+.is_enabled  | y    |             |               |             |      |
+             |      |             |               |             |      |
+.recalc_rate |      | y           |               |             |      |
+.round_rate  |      | y           |               |             |      |
+.set_rate    |      | y           |               |             |      |
+             |      |             |               |             |      |
+.set_parent  |      |             | n             | y           | n    |
+.get_parent  |      |             | n             | y           | n    |
+             |      |             |               |             |      |
+.init        |      |             |               |             |      |
+             -----------------------------------------------------------
+Finally, register your clock at run-time with a hardware-specific
+registration function.  This function simply populates struct clk_foo's
+data and then passes the common struct clk parameters to the framework
+with a call to:
+clk_register(...)
+See the basic clock types in drivers/clk/clk-*.c for examples.
+        Part 5 - static initialization of clock data
+For platforms with many clocks (often numbering into the hundreds) it
+may be desirable to statically initialize some clock data.  This
+presents a problem since the definition of struct clk should be hidden
+from everyone except for the clock core in drivers/clk/clk.c.
+To get around this problem struct clk's definition is exposed in
+include/linux/clk-private.h along with some macros for more easily
+initializing instances of the basic clock types.  These clocks must
+still be initialized with the common clock framework via a call to
+__clk_init.
+clk-private.h must NEVER be included by code which implements struct
+clk_ops callbacks, nor must it be included by any logic which pokes
+around inside of struct clk at run-time.  To do so is a layering
+violation.
+To better enforce this policy, always follow this simple rule: any
+statically initialized clock data MUST be defined in a separate file
+from the logic that implements its ops.  Basically separate the logic
+from the data and all is well.
diff --git a/Documentation/crc32.txt b/Documentation/crc32.txt
new file mode 100644
index 000000000000..a08a7dd9d625
--- /dev/null
+++ b/Documentation/crc32.txt
@@ -0,0 +1,182 @@
+A brief CRC tutorial.
+A CRC is a long-division remainder.  You add the CRC to the message,
+and the whole thing (message+CRC) is a multiple of the given
+CRC polynomial.  To check the CRC, you can either check that the
+CRC matches the recomputed value, *or* you can check that the
+remainder computed on the message+CRC is 0.  This latter approach
+is used by a lot of hardware implementations, and is why so many
+protocols put the end-of-frame flag after the CRC.
+It's actually the same long division you learned in school, except that
+- We're working in binary, so the digits are only 0 and 1, and
+- When dividing polynomials, there are no carries.  Rather than add and
+  subtract, we just xor.  Thus, we tend to get a bit sloppy about
+  the difference between adding and subtracting.
+Like all division, the remainder is always smaller than the divisor.
+To produce a 32-bit CRC, the divisor is actually a 33-bit CRC polynomial.
+Since it's 33 bits long, bit 32 is always going to be set, so usually the
+CRC is written in hex with the most significant bit omitted.  (If you're
+familiar with the IEEE 754 floating-point format, it's the same idea.)
+Note that a CRC is computed over a string of *bits*, so you have
+to decide on the endianness of the bits within each byte.  To get
+the best error-detecting properties, this should correspond to the
+order they're actually sent.  For example, standard RS-232 serial is
+little-endian; the most significant bit (sometimes used for parity)
+is sent last.  And when appending a CRC word to a message, you should
+do it in the right order, matching the endianness.
+Just like with ordinary division, you proceed one digit (bit) at a time.
+Each step of the division you take one more digit (bit) of the dividend
+and append it to the current remainder.  Then you figure out the
+appropriate multiple of the divisor to subtract to being the remainder
+back into range.  In binary, this is easy - it has to be either 0 or 1,
+and to make the XOR cancel, it's just a copy of bit 32 of the remainder.
+When computing a CRC, we don't care about the quotient, so we can
+throw the quotient bit away, but subtract the appropriate multiple of
+the polynomial from the remainder and we're back to where we started,
+ready to process the next bit.
+A big-endian CRC written this way would be coded like:
+for (i = 0; i < input_bits; i++) {
+        multiple = remainder & 0x80000000 ? CRCPOLY : 0;
+        remainder = (remainder << 1 | next_input_bit()) ^ multiple;
+}
+Notice how, to get at bit 32 of the shifted remainder, we look
+at bit 31 of the remainder *before* shifting it.
+But also notice how the next_input_bit() bits we're shifting into
+the remainder don't actually affect any decision-making until
+32 bits later.  Thus, the first 32 cycles of this are pretty boring.
+Also, to add the CRC to a message, we need a 32-bit-long hole for it at
+the end, so we have to add 32 extra cycles shifting in zeros at the
+end of every message,
+These details lead to a standard trick: rearrange merging in the
+next_input_bit() until the moment it's needed.  Then the first 32 cycles
+can be precomputed, and merging in the final 32 zero bits to make room
+for the CRC can be skipped entirely.  This changes the code to:
+for (i = 0; i < input_bits; i++) {
+        remainder ^= next_input_bit() << 31;
+        multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+        remainder = (remainder << 1) ^ multiple;
+}
+With this optimization, the little-endian code is particularly simple:
+for (i = 0; i < input_bits; i++) {
+        remainder ^= next_input_bit();
+        multiple = (remainder & 1) ? CRCPOLY : 0;
+        remainder = (remainder >> 1) ^ multiple;
+}
+The most significant coefficient of the remainder polynomial is stored
+in the least significant bit of the binary "remainder" variable.
+The other details of endianness have been hidden in CRCPOLY (which must
+be bit-reversed) and next_input_bit().
+As long as next_input_bit is returning the bits in a sensible order, we don't
+*have* to wait until the last possible moment to merge in additional bits.
+We can do it 8 bits at a time rather than 1 bit at a time:
+for (i = 0; i < input_bytes; i++) {
+        remainder ^= next_input_byte() << 24;
+        for (j = 0; j < 8; j++) {
+                multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+                remainder = (remainder << 1) ^ multiple;
+        }
+}
+Or in little-endian:
+for (i = 0; i < input_bytes; i++) {
+        remainder ^= next_input_byte();
+        for (j = 0; j < 8; j++) {
+                multiple = (remainder & 1) ? CRCPOLY : 0;
+                remainder = (remainder >> 1) ^ multiple;
+        }
+}
+If the input is a multiple of 32 bits, you can even XOR in a 32-bit
+word at a time and increase the inner loop count to 32.
+You can also mix and match the two loop styles, for example doing the
+bulk of a message byte-at-a-time and adding bit-at-a-time processing
+for any fractional bytes at the end.
+To reduce the number of conditional branches, software commonly uses
+the byte-at-a-time table method, popularized by Dilip V. Sarwate,
+"Computation of Cyclic Redundancy Checks via Table Look-Up", Comm. ACM
+v.31 no.8 (August 1998) p. 1008-1013.
+Here, rather than just shifting one bit of the remainder to decide
+in the correct multiple to subtract, we can shift a byte at a time.
+This produces a 40-bit (rather than a 33-bit) intermediate remainder,
+and the correct multiple of the polynomial to subtract is found using
+a 256-entry lookup table indexed by the high 8 bits.
+(The table entries are simply the CRC-32 of the given one-byte messages.)
+When space is more constrained, smaller tables can be used, e.g. two
+4-bit shifts followed by a lookup in a 16-entry table.
+It is not practical to process much more than 8 bits at a time using this
+technique, because tables larger than 256 entries use too much memory and,
+more importantly, too much of the L1 cache.
+To get higher software performance, a "slicing" technique can be used.
+See "High Octane CRC Generation with the Intel Slicing-by-8 Algorithm",
+ftp://download.intel.com/technology/comms/perfnet/download/slicing-by-8.pdf
+This does not change the number of table lookups, but does increase
+the parallelism.  With the classic Sarwate algorithm, each table lookup
+must be completed before the index of the next can be computed.
+A "slicing by 2" technique would shift the remainder 16 bits at a time,
+producing a 48-bit intermediate remainder.  Rather than doing a single
+lookup in a 65536-entry table, the two high bytes are looked up in
+two different 256-entry tables.  Each contains the remainder required
+to cancel out the corresponding byte.  The tables are different because the
+polynomials to cancel are different.  One has non-zero coefficients from
+x^32 to x^39, while the other goes from x^40 to x^47.
+Since modern processors can handle many parallel memory operations, this
+takes barely longer than a single table look-up and thus performs almost
+twice as fast as the basic Sarwate algorithm.
+This can be extended to "slicing by 4" using 4 256-entry tables.
+Each step, 32 bits of data is fetched, XORed with the CRC, and the result
+broken into bytes and looked up in the tables.  Because the 32-bit shift
+leaves the low-order bits of the intermediate remainder zero, the
+final CRC is simply the XOR of the 4 table look-ups.
+But this still enforces sequential execution: a second group of table
+look-ups cannot begin until the previous groups 4 table look-ups have all
+been completed.  Thus, the processor's load/store unit is sometimes idle.
+To make maximum use of the processor, "slicing by 8" performs 8 look-ups
+in parallel.  Each step, the 32-bit CRC is shifted 64 bits and XORed
+with 64 bits of input data.  What is important to note is that 4 of
+those 8 bytes are simply copies of the input data; they do not depend
+on the previous CRC at all.  Thus, those 4 table look-ups may commence
+immediately, without waiting for the previous loop iteration.
+By always having 4 loads in flight, a modern superscalar processor can
+be kept busy and make full use of its L1 cache.
+Two more details about CRC implementation in the real world:
+Normally, appending zero bits to a message which is already a multiple
+of a polynomial produces a larger multiple of that polynomial.  Thus,
+a basic CRC will not detect appended zero bits (or bytes).  To enable
+a CRC to detect this condition, it's common to invert the CRC before
+appending it.  This makes the remainder of the message+crc come out not
+as zero, but some fixed non-zero value.  (The CRC of the inversion
+pattern, 0xffffffff.)
+The same problem applies to zero bits prepended to the message, and a
+similar solution is used.  Instead of starting the CRC computation with
+a remainder of 0, an initial remainder of all ones is used.  As long as
+you start the same way on decoding, it doesn't make a difference.
diff --git a/Documentation/device-mapper/thin-provisioning.txt b/Documentation/device-mapper/thin-provisioning.txt
index 1ff044d87ca4..3370bc4d7b98 100644
--- a/Documentation/device-mapper/thin-provisioning.txt
+++ b/Documentation/device-mapper/thin-provisioning.txt
@@ -75,10 +75,12 @@ less sharing than average you'll need a larger-than-average metadata device.
 As a guide, we suggest you calculate the number of bytes to use in the
 metadata device as 48 * $data_dev_size / $data_block_size but round it up
-to 2MB if the answer is smaller.  The largest size supported is 16GB.
+to 2MB if the answer is smaller.  If you're creating large numbers of
+snapshots which are recording large amounts of change, you may find you
+need to increase this.
-If you're creating large numbers of snapshots which are recording large
+The largest size supported is 16GB: If the device is larger,
-amounts of change, you may need find you need to increase this.
+a warning will be issued and the excess space will not be used.
 Reloading a pool table
 ----------------------
@@ -167,6 +169,38 @@ ii) Using an internal snapshot.
    dmsetup create snap --table "0 2097152 thin /dev/mapper/pool 1"
+External snapshots
+------------------
+You can use an external _read only_ device as an origin for a
+thinly-provisioned volume.  Any read to an unprovisioned area of the
+thin device will be passed through to the origin.  Writes trigger
+the allocation of new blocks as usual.
+One use case for this is VM hosts that want to run guests on
+thinly-provisioned volumes but have the base image on another device
+(possibly shared between many VMs).
+You must not write to the origin device if you use this technique!
+Of course, you may write to the thin device and take internal snapshots
+of the thin volume.
+i) Creating a snapshot of an external device
+  This is the same as creating a thin device.
+  You don't mention the origin at this stage.
+    dmsetup message /dev/mapper/pool 0 "create_thin 0"
+ii) Using a snapshot of an external device.
+  Append an extra parameter to the thin target specifying the origin:
+    dmsetup create snap --table "0 2097152 thin /dev/mapper/pool 0 /dev/image"
+  N.B. All descendants (internal snapshots) of this snapshot require the
+  same extra origin parameter.
 Deactivation
 ------------
@@ -189,7 +223,13 @@ i) Constructor
              <low water mark (blocks)> [<number of feature args> [<arg>]*]
    Optional feature arguments:
-    - 'skip_block_zeroing': skips the zeroing of newly-provisioned blocks.
+      skip_block_zeroing: Skip the zeroing of newly-provisioned blocks.
+      ignore_discard: Disable discard support.
+      no_discard_passdown: Don't pass discards down to the underlying
+                           data device, but just remove the mapping.
    Data block size must be between 64KB (128 sectors) and 1GB
    (2097152 sectors) inclusive.
@@ -237,16 +277,6 @@ iii) Messages
        Deletes a thin device.  Irreversible.
-    trim <dev id> <new size in sectors>
-        Delete mappings from the end of a thin device.  Irreversible.
-        You might want to use this if you're reducing the size of
-        your thinly-provisioned device.  In many cases, due to the
-        sharing of blocks between devices, it is not possible to
-        determine in advance how much space 'trim' will release.  (In
-        future a userspace tool might be able to perform this
-        calculation.)
    set_transaction_id <current id> <new id>
        Userland volume managers, such as LVM, need a way to
@@ -262,7 +292,7 @@ iii) Messages
 i) Constructor
-    thin <pool dev> <dev id>
+    thin <pool dev> <dev id> [<external origin dev>]
    pool dev:
        the thin-pool device, e.g. /dev/mapper/my_pool or 253:0
@@ -271,6 +301,11 @@ i) Constructor
        the internal device identifier of the device to be
        activated.
+    external origin dev:
+        an optional block device outside the pool to be treated as a
+        read-only snapshot origin: reads to unprovisioned areas of the
+        thin target will be mapped to this device.
 The pool doesn't store any size against the thin devices.  If you
 load a thin target that is smaller than you've been using previously,
 then you'll have no access to blocks mapped beyond the end.  If you
diff --git a/Documentation/device-mapper/verity.txt b/Documentation/device-mapper/verity.txt
new file mode 100644
index 000000000000..32e48797a14f
--- /dev/null
+++ b/Documentation/device-mapper/verity.txt
@@ -0,0 +1,194 @@
+dm-verity
+==========
+Device-Mapper's "verity" target provides transparent integrity checking of
+block devices using a cryptographic digest provided by the kernel crypto API.
+This target is read-only.
+Construction Parameters
+=======================
+    <version> <dev> <hash_dev> <hash_start>
+    <data_block_size> <hash_block_size>
+    <num_data_blocks> <hash_start_block>
+    <algorithm> <digest> <salt>
+<version>
+    This is the version number of the on-disk format.
+    0 is the original format used in the Chromium OS.
+        The salt is appended when hashing, digests are stored continuously and
+        the rest of the block is padded with zeros.
+    1 is the current format that should be used for new devices.
+        The salt is prepended when hashing and each digest is
+        padded with zeros to the power of two.
+<dev>
+    This is the device containing the data the integrity of which needs to be
+    checked.  It may be specified as a path, like /dev/sdaX, or a device number,
+    <major>:<minor>.
+<hash_dev>
+    This is the device that that supplies the hash tree data.  It may be
+    specified similarly to the device path and may be the same device.  If the
+    same device is used, the hash_start should be outside of the dm-verity
+    configured device size.
+<data_block_size>
+    The block size on a data device.  Each block corresponds to one digest on
+    the hash device.
+<hash_block_size>
+    The size of a hash block.
+<num_data_blocks>
+    The number of data blocks on the data device.  Additional blocks are
+    inaccessible.  You can place hashes to the same partition as data, in this
+    case hashes are placed after <num_data_blocks>.
+<hash_start_block>
+    This is the offset, in <hash_block_size>-blocks, from the start of hash_dev
+    to the root block of the hash tree.
+<algorithm>
+    The cryptographic hash algorithm used for this device.  This should
+    be the name of the algorithm, like "sha1".
+<digest>
+    The hexadecimal encoding of the cryptographic hash of the root hash block
+    and the salt.  This hash should be trusted as there is no other authenticity
+    beyond this point.
+<salt>
+    The hexadecimal encoding of the salt value.
+Theory of operation
+===================
+dm-verity is meant to be setup as part of a verified boot path.  This
+may be anything ranging from a boot using tboot or trustedgrub to just
+booting from a known-good device (like a USB drive or CD).
+When a dm-verity device is configured, it is expected that the caller
+has been authenticated in some way (cryptographic signatures, etc).
+After instantiation, all hashes will be verified on-demand during
+disk access.  If they cannot be verified up to the root node of the
+tree, the root hash, then the I/O will fail.  This should identify
+tampering with any data on the device and the hash data.
+Cryptographic hashes are used to assert the integrity of the device on a
+per-block basis.  This allows for a lightweight hash computation on first read
+into the page cache.  Block hashes are stored linearly-aligned to the nearest
+block the size of a page.
+Hash Tree
+---------
+Each node in the tree is a cryptographic hash.  If it is a leaf node, the hash
+is of some block data on disk.  If it is an intermediary node, then the hash is
+of a number of child nodes.
+Each entry in the tree is a collection of neighboring nodes that fit in one
+block.  The number is determined based on block_size and the size of the
+selected cryptographic digest algorithm.  The hashes are linearly-ordered in
+this entry and any unaligned trailing space is ignored but included when
+calculating the parent node.
+The tree looks something like:
+alg = sha256, num_blocks = 32768, block_size = 4096
+                                 [   root    ]
+                                /    . . .    \
+                     [entry_0]                 [entry_1]
+                    /  . . .  \                 . . .   \
+         [entry_0_0]   . . .  [entry_0_127]    . . . .  [entry_1_127]
+           / ... \             /   . . .  \             /           \
+     blk_0 ... blk_127  blk_16256   blk_16383      blk_32640 . . . blk_32767
+On-disk format
+==============
+Below is the recommended on-disk format. The verity kernel code does not
+read the on-disk header. It only reads the hash blocks which directly
+follow the header. It is expected that a user-space tool will verify the
+integrity of the verity_header and then call dmsetup with the correct
+parameters. Alternatively, the header can be omitted and the dmsetup
+parameters can be passed via the kernel command-line in a rooted chain
+of trust where the command-line is verified.
+The on-disk format is especially useful in cases where the hash blocks
+are on a separate partition. The magic number allows easy identification
+of the partition contents. Alternatively, the hash blocks can be stored
+in the same partition as the data to be verified. In such a configuration
+the filesystem on the partition would be sized a little smaller than
+the full-partition, leaving room for the hash blocks.
+struct superblock {
+        uint8_t signature[8]
+                "verity\0\0";
+        uint8_t version;
+                1 - current format
+        uint8_t data_block_bits;
+                log2(data block size)
+        uint8_t hash_block_bits;
+                log2(hash block size)
+        uint8_t pad1[1];
+                zero padding
+        uint16_t salt_size;
+                big-endian salt size
+        uint8_t pad2[2];
+                zero padding
+        uint32_t data_blocks_hi;
+                big-endian high 32 bits of the 64-bit number of data blocks
+        uint32_t data_blocks_lo;
+                big-endian low 32 bits of the 64-bit number of data blocks
+        uint8_t algorithm[16];
+                cryptographic algorithm
+        uint8_t salt[384];
+                salt (the salt size is specified above)
+        uint8_t pad3[88];
+                zero padding to 512-byte boundary
+}
+Directly following the header (and with sector number padded to the next hash
+block boundary) are the hash blocks which are stored a depth at a time
+(starting from the root), sorted in order of increasing index.
+Status
+======
+V (for Valid) is returned if every check performed so far was valid.
+If any check failed, C (for Corruption) is returned.
+Example
+=======
+Setup a device:
+  dmsetup create vroot --table \
+    "0 2097152 "\
+    "verity 1 /dev/sda1 /dev/sda2 4096 4096 2097152 1 "\
+    "4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076 "\
+    "1234000000000000000000000000000000000000000000000000000000000000"
+A command line tool veritysetup is available to compute or verify
+the hash tree or activate the kernel driver.  This is available from
+the LVM2 upstream repository and may be supplied as a package called
+device-mapper-verity-tools:
+    git://sources.redhat.com/git/lvm2
+    http://sourceware.org/git/?p=lvm2.git
+    http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/verity?cvsroot=lvm2
+veritysetup -a vroot /dev/sda1 /dev/sda2 \
+        4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076
diff --git a/Documentation/devicetree/bindings/arm/atmel-aic.txt b/Documentation/devicetree/bindings/arm/atmel-aic.txt
new file mode 100644
index 000000000000..aabca4f83402
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-aic.txt
@@ -0,0 +1,38 @@
+* Advanced Interrupt Controller (AIC)
+Required properties:
+- compatible: Should be "atmel,<chip>-aic"
+- interrupt-controller: Identifies the node as an interrupt controller.
+- interrupt-parent: For single AIC system, it is an empty property.
+- #interrupt-cells: The number of cells to define the interrupts. It sould be 2.
+  The first cell is the IRQ number (aka "Peripheral IDentifier" on datasheet).
+  The second cell is used to specify flags:
+    bits[3:0] trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
+      Valid combinations are 1, 2, 3, 4, 8.
+      Default flag for internal sources should be set to 4 (active high).
+- reg: Should contain AIC registers location and length
+Examples:
+        /*
+         * AIC
+         */
+        aic: interrupt-controller@fffff000 {
+                compatible = "atmel,at91rm9200-aic";
+                interrupt-controller;
+                interrupt-parent;
+                #interrupt-cells = <2>;
+                reg = <0xfffff000 0x200>;
+        };
+        /*
+         * An interrupt generating device that is wired to an AIC.
+         */
+        dma: dma-controller@ffffec00 {
+                compatible = "atmel,at91sam9g45-dma";
+                reg = <0xffffec00 0x200>;
+                interrupts = <21 4>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt
new file mode 100644
index 000000000000..ecc81e368715
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt
@@ -0,0 +1,92 @@
+Atmel AT91 device tree bindings.
+================================
+PIT Timer required properties:
+- compatible: Should be "atmel,at91sam9260-pit"
+- reg: Should contain registers location and length
+- interrupts: Should contain interrupt for the PIT which is the IRQ line
+  shared across all System Controller members.
+TC/TCLIB Timer required properties:
+- compatible: Should be "atmel,<chip>-pit".
+  <chip> can be "at91rm9200" or "at91sam9x5"
+- reg: Should contain registers location and length
+- interrupts: Should contain all interrupts for the TC block
+  Note that you can specify several interrupt cells if the TC
+  block has one interrupt per channel.
+Examples:
+One interrupt per TC block:
+        tcb0: timer@fff7c000 {
+                compatible = "atmel,at91rm9200-tcb";
+                reg = <0xfff7c000 0x100>;
+                interrupts = <18 4>;
+        };
+One interrupt per TC channel in a TC block:
+        tcb1: timer@fffdc000 {
+                compatible = "atmel,at91rm9200-tcb";
+                reg = <0xfffdc000 0x100>;
+                interrupts = <26 4 27 4 28 4>;
+        };
+RSTC Reset Controller required properties:
+- compatible: Should be "atmel,<chip>-rstc".
+  <chip> can be "at91sam9260" or "at91sam9g45"
+- reg: Should contain registers location and length
+Example:
+        rstc@fffffd00 {
+                compatible = "atmel,at91sam9260-rstc";
+                reg = <0xfffffd00 0x10>;
+        };
+RAMC SDRAM/DDR Controller required properties:
+- compatible: Should be "atmel,at91sam9260-sdramc",
+                        "atmel,at91sam9g45-ddramc",
+- reg: Should contain registers location and length
+  For at91sam9263 and at91sam9g45 you must specify 2 entries.
+Examples:
+        ramc0: ramc@ffffe800 {
+                compatible = "atmel,at91sam9g45-ddramc";
+                reg = <0xffffe800 0x200>;
+        };
+        ramc0: ramc@ffffe400 {
+                compatible = "atmel,at91sam9g45-ddramc";
+                reg = <0xffffe400 0x200
+                       0xffffe600 0x200>;
+        };
+SHDWC Shutdown Controller
+required properties:
+- compatible: Should be "atmel,<chip>-shdwc".
+  <chip> can be "at91sam9260", "at91sam9rl" or "at91sam9x5".
+- reg: Should contain registers location and length
+optional properties:
+- atmel,wakeup-mode: String, operation mode of the wakeup mode.
+  Supported values are: "none", "high", "low", "any".
+- atmel,wakeup-counter: Counter on Wake-up 0 (between 0x0 and 0xf).
+optional at91sam9260 properties:
+- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
+optional at91sam9rl properties:
+- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
+- atmel,wakeup-rtt-timer: boolean to enable Real-time Timer Wake-up.
+optional at91sam9x5 properties:
+- atmel,wakeup-rtc-timer: boolean to enable Real-time Clock Wake-up.
+Example:
+        rstc@fffffd00 {
+                compatible = "atmel,at91sam9260-rstc";
+                reg = <0xfffffd00 0x10>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/atmel-pmc.txt b/Documentation/devicetree/bindings/arm/atmel-pmc.txt
new file mode 100644
index 000000000000..389bed5056e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/atmel-pmc.txt
@@ -0,0 +1,11 @@
+* Power Management Controller (PMC)
+Required properties:
+- compatible: Should be "atmel,at91rm9200-pmc"
+- reg: Should contain PMC registers location and length
+Examples:
+        pmc: pmc@fffffc00 {
+                compatible = "atmel,at91rm9200-pmc";
+                reg = <0xfffffc00 0x100>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index 54bdddadf1cf..bfbc771a65f8 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -28,3 +28,25 @@ Required root node properties:
 i.MX6 Quad SABRE Lite Board
 Required root node properties:
    - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q";
+Generic i.MX boards
+-------------------
+No iomux setup is done for these boards, so this must have been configured
+by the bootloader for boards to work with the generic bindings.
+i.MX27 generic board
+Required root node properties:
+    - compatible = "fsl,imx27";
+i.MX51 generic board
+Required root node properties:
+    - compatible = "fsl,imx51";
+i.MX53 generic board
+Required root node properties:
+    - compatible = "fsl,imx53";
+i.MX6q generic board
+Required root node properties:
+    - compatible = "fsl,imx6q";
diff --git a/Documentation/devicetree/bindings/arm/mrvl.txt b/Documentation/devicetree/bindings/arm/mrvl.txt
new file mode 100644
index 000000000000..d8de933e9d81
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mrvl.txt
@@ -0,0 +1,6 @@
+Marvell Platforms Device Tree Bindings
+----------------------------------------------------
+PXA168 Aspenite Board
+Required root node properties:
+        - compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168";
diff --git a/Documentation/devicetree/bindings/arm/omap/intc.txt b/Documentation/devicetree/bindings/arm/omap/intc.txt
new file mode 100644
index 000000000000..f2583e6ec060
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/omap/intc.txt
@@ -0,0 +1,27 @@
+* OMAP Interrupt Controller
+OMAP2/3 are using a TI interrupt controller that can support several
+configurable number of interrupts.
+Main node required properties:
+- compatible : should be:
+        "ti,omap2-intc"
+- interrupt-controller : Identifies the node as an interrupt controller
+- #interrupt-cells : Specifies the number of cells needed to encode an
+  interrupt source. The type shall be a <u32> and the value shall be 1.
+  The cell contains the interrupt number in the range [0-128].
+- ti,intc-size: Number of interrupts handled by the interrupt controller.
+- reg: physical base address and size of the intc registers map.
+Example:
+        intc: interrupt-controller@1 {
+                compatible = "ti,omap2-intc";
+                interrupt-controller;
+                #interrupt-cells = <1>;
+                ti,intc-size = <96>;
+                reg = <0x48200000 0x1000>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/spear.txt b/Documentation/devicetree/bindings/arm/spear.txt
new file mode 100644
index 000000000000..f8e54f092328
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/spear.txt
@@ -0,0 +1,8 @@
+ST SPEAr Platforms Device Tree Bindings
+---------------------------------------
+Boards with the ST SPEAr600 SoC shall have the following properties:
+Required root node property:
+compatible = "st,spear600";
diff --git a/Documentation/devicetree/bindings/arm/tegra/emc.txt b/Documentation/devicetree/bindings/arm/tegra/emc.txt
new file mode 100644
index 000000000000..09335f8eee00
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/tegra/emc.txt
@@ -0,0 +1,100 @@
+Embedded Memory Controller
+Properties:
+- name : Should be emc
+- #address-cells : Should be 1
+- #size-cells : Should be 0
+- compatible : Should contain "nvidia,tegra20-emc".
+- reg : Offset and length of the register set for the device
+- nvidia,use-ram-code : If present, the sub-nodes will be addressed
+  and chosen using the ramcode board selector. If omitted, only one
+  set of tables can be present and said tables will be used
+  irrespective of ram-code configuration.
+Child device nodes describe the memory settings for different configurations and clock rates.
+Example:
+        emc@7000f400 {
+                #address-cells = < 1 >;
+                #size-cells = < 0 >;
+                compatible = "nvidia,tegra20-emc";
+                reg = <0x7000f4000 0x200>;
+        }
+Embedded Memory Controller ram-code table
+If the emc node has the nvidia,use-ram-code property present, then the
+next level of nodes below the emc table are used to specify which settings
+apply for which ram-code settings.
+If the emc node lacks the nvidia,use-ram-code property, this level is omitted
+and the tables are stored directly under the emc node (see below).
+Properties:
+- name : Should be emc-tables
+- nvidia,ram-code : the binary representation of the ram-code board strappings
+  for which this node (and children) are valid.
+Embedded Memory Controller configuration table
+This is a table containing the EMC register settings for the various
+operating speeds of the memory controller. They are always located as
+subnodes of the emc controller node.
+There are two ways of specifying which tables to use:
+* The simplest is if there is just one set of tables in the device tree,
+  and they will always be used (based on which frequency is used).
+  This is the preferred method, especially when firmware can fill in
+  this information based on the specific system information and just
+  pass it on to the kernel.
+* The slightly more complex one is when more than one memory configuration
+  might exist on the system.  The Tegra20 platform handles this during
+  early boot by selecting one out of possible 4 memory settings based
+  on a 2-pin "ram code" bootstrap setting on the board. The values of
+  these strappings can be read through a register in the SoC, and thus
+  used to select which tables to use.
+Properties:
+- name : Should be emc-table
+- compatible : Should contain "nvidia,tegra20-emc-table".
+- reg : either an opaque enumerator to tell different tables apart, or
+  the valid frequency for which the table should be used (in kHz).
+- clock-frequency : the clock frequency for the EMC at which this
+  table should be used (in kHz).
+- nvidia,emc-registers : a 46 word array of EMC registers to be programmed
+  for operation at the 'clock-frequency' setting.
+  The order and contents of the registers are:
+    RC, RFC, RAS, RP, R2W, W2R, R2P, W2P, RD_RCD, WR_RCD, RRD, REXT,
+    WDV, QUSE, QRST, QSAFE, RDV, REFRESH, BURST_REFRESH_NUM, PDEX2WR,
+    PDEX2RD, PCHG2PDEN, ACT2PDEN, AR2PDEN, RW2PDEN, TXSR, TCKE, TFAW,
+    TRPAB, TCLKSTABLE, TCLKSTOP, TREFBW, QUSE_EXTRA, FBIO_CFG6, ODT_WRITE,
+    ODT_READ, FBIO_CFG5, CFG_DIG_DLL, DLL_XFORM_DQS, DLL_XFORM_QUSE,
+    ZCAL_REF_CNT, ZCAL_WAIT_CNT, AUTO_CAL_INTERVAL, CFG_CLKTRIM_0,
+    CFG_CLKTRIM_1, CFG_CLKTRIM_2
+                emc-table@166000 {
+                        reg = <166000>;
+                        compatible = "nvidia,tegra20-emc-table";
+                        clock-frequency = < 166000 >;
+                        nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 >;
+                };
+                emc-table@333000 {
+                        reg = <333000>;
+                        compatible = "nvidia,tegra20-emc-table";
+                        clock-frequency = < 333000 >;
+                        nvidia,emc-registers = < 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+                                                 0 0 0 0 >;
+                };
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
new file mode 100644
index 000000000000..b5846e21cc2e
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt
@@ -0,0 +1,19 @@
+NVIDIA Tegra Power Management Controller (PMC)
+Properties:
+- name : Should be pmc
+- compatible : Should contain "nvidia,tegra<chip>-pmc".
+- reg : Offset and length of the register set for the device
+- nvidia,invert-interrupt : If present, inverts the PMU interrupt signal.
+  The PMU is an external Power Management Unit, whose interrupt output
+  signal is fed into the PMC. This signal is optionally inverted, and then
+  fed into the ARM GIC. The PMC is not involved in the detection or
+  handling of this interrupt signal, merely its inversion.
+Example:
+pmc@7000f400 {
+        compatible = "nvidia,tegra20-pmc";
+        reg = <0x7000e400 0x400>;
+        nvidia,invert-interrupt;
+};
diff --git a/Documentation/devicetree/bindings/arm/twd.txt b/Documentation/devicetree/bindings/arm/twd.txt
new file mode 100644
index 000000000000..75b8610939fa
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/twd.txt
@@ -0,0 +1,48 @@
+* ARM Timer Watchdog
+ARM 11MP, Cortex-A5 and Cortex-A9 are often associated with a per-core
+Timer-Watchdog (aka TWD), which provides both a per-cpu local timer
+and watchdog.
+The TWD is usually attached to a GIC to deliver its two per-processor
+interrupts.
+** Timer node required properties:
+- compatible : Should be one of:
+        "arm,cortex-a9-twd-timer"
+        "arm,cortex-a5-twd-timer"
+        "arm,arm11mp-twd-timer"
+- interrupts : One interrupt to each core
+- reg : Specify the base address and the size of the TWD timer
+        register window.
+Example:
+        twd-timer@2c000600 {
+                compatible = "arm,arm11mp-twd-timer"";
+                reg = <0x2c000600 0x20>;
+                interrupts = <1 13 0xf01>;
+        };
+** Watchdog node properties:
+- compatible : Should be one of:
+        "arm,cortex-a9-twd-wdt"
+        "arm,cortex-a5-twd-wdt"
+        "arm,arm11mp-twd-wdt"
+- interrupts : One interrupt to each core
+- reg : Specify the base address and the size of the TWD watchdog
+        register window.
+Example:
+        twd-watchdog@2c000620 {
+                compatible = "arm,arm11mp-twd-wdt";
+                reg = <0x2c000620 0x20>;
+                interrupts = <1 14 0xf01>;
+        };
diff --git a/Documentation/devicetree/bindings/arm/vexpress.txt b/Documentation/devicetree/bindings/arm/vexpress.txt
new file mode 100644
index 000000000000..ec8b50cbb2e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/vexpress.txt
@@ -0,0 +1,146 @@
+ARM Versatile Express boards family
+-----------------------------------
+ARM's Versatile Express platform consists of a motherboard and one
+or more daughterboards (tiles). The motherboard provides a set of
+peripherals. Processor and RAM "live" on the tiles.
+The motherboard and each core tile should be described by a separate
+Device Tree source file, with the tile's description including
+the motherboard file using a /include/ directive. As the motherboard
+can be initialized in one of two different configurations ("memory
+maps"), care must be taken to include the correct one.
+Required properties in the root node:
+- compatible value:
+        compatible = "arm,vexpress,<model>", "arm,vexpress";
+  where <model> is the full tile model name (as used in the tile's
+    Technical Reference Manual), eg.:
+    - for Coretile Express A5x2 (V2P-CA5s):
+        compatible = "arm,vexpress,v2p-ca5s", "arm,vexpress";
+    - for Coretile Express A9x4 (V2P-CA9):
+        compatible = "arm,vexpress,v2p-ca9", "arm,vexpress";
+  If a tile comes in several variants or can be used in more then one
+  configuration, the compatible value should be:
+        compatible = "arm,vexpress,<model>,<variant>", \
+                                "arm,vexpress,<model>", "arm,vexpress";
+  eg:
+    - Coretile Express A15x2 (V2P-CA15) with Tech Chip 1:
+        compatible = "arm,vexpress,v2p-ca15,tc1", \
+                                "arm,vexpress,v2p-ca15", "arm,vexpress";
+    - LogicTile Express 13MG (V2F-2XV6) running Cortex-A7 (3 cores) SMM:
+        compatible = "arm,vexpress,v2f-2xv6,ca7x3", \
+                                "arm,vexpress,v2f-2xv6", "arm,vexpress";
+Optional properties in the root node:
+- tile model name (use name from the tile's Technical Reference
+  Manual, eg. "V2P-CA5s")
+        model = "<model>";
+- tile's HBI number (unique ARM's board model ID, visible on the
+  PCB's silkscreen) in hexadecimal transcription:
+        arm,hbi = <0xhbi>
+  eg:
+  - for Coretile Express A5x2 (V2P-CA5s) HBI-0191:
+        arm,hbi = <0x191>;
+  - Coretile Express A9x4 (V2P-CA9) HBI-0225:
+        arm,hbi = <0x225>;
+Top-level standard "cpus" node is required. It must contain a node
+with device_type = "cpu" property for every available core, eg.:
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a5";
+                        reg = <0>;
+                };
+        };
+The motherboard description file provides a single "motherboard" node
+using 2 address cells corresponding to the Static Memory Bus used
+between the motherboard and the tile. The first cell defines the Chip
+Select (CS) line number, the second cell address offset within the CS.
+All interrupt lines between the motherboard and the tile are active
+high and are described using single cell.
+Optional properties of the "motherboard" node:
+- motherboard's memory map variant:
+        arm,v2m-memory-map = "<name>";
+  where name is one of:
+  - "rs1" - for RS1 map (i.a. peripherals on CS3); this map is also
+            referred to as "ARM Cortex-A Series memory map":
+        arm,v2m-memory-map = "rs1";
+  When this property is missing, the motherboard is using the original
+  memory map (also known as the "Legacy memory map", primarily used
+  with the original CoreTile Express A9x4) with peripherals on CS7.
+Motherboard .dtsi files provide a set of labelled peripherals that
+can be used to obtain required phandle in the tile's "aliases" node:
+- UARTs, note that the numbers correspond to the physical connectors
+  on the motherboard's back panel:
+        v2m_serial0, v2m_serial1, v2m_serial2 and v2m_serial3
+- I2C controllers:
+        v2m_i2c_dvi and v2m_i2c_pcie
+- SP804 timers:
+        v2m_timer01 and v2m_timer23
+Current Linux implementation requires a "arm,v2m_timer" alias
+pointing at one of the motherboard's SP804 timers, if it is to be
+used as the system timer. This alias should be defined in the
+motherboard files.
+The tile description must define "ranges", "interrupt-map-mask" and
+"interrupt-map" properties to translate the motherboard's address
+and interrupt space into one used by the tile's processor.
+Abbreviated example:
+/dts-v1/;
+/ {
+        model = "V2P-CA5s";
+        arm,hbi = <0x225>;
+        compatible = "arm,vexpress-v2p-ca5s", "arm,vexpress";
+        interrupt-parent = <&gic>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+        chosen { };
+        aliases {
+                serial0 = &v2m_serial0;
+        };
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a5";
+                        reg = <0>;
+                };
+        };
+        gic: interrupt-controller@2c001000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0x2c001000 0x1000>,
+                      <0x2c000100 0x100>;
+        };
+        motherboard {
+                /* CS0 is visible at 0x08000000 */
+                ranges = <0 0 0x08000000 0x04000000>;
+                interrupt-map-mask = <0 0 63>;
+                /* Active high IRQ 0 is connected to GIC's SPI0 */
+                interrupt-map = <0 0 0 &gic 0 0 4>;
+        };
+};
+/include/ "vexpress-v2m-rs1.dtsi"
diff --git a/Documentation/devicetree/bindings/dma/tegra20-apbdma.txt b/Documentation/devicetree/bindings/dma/tegra20-apbdma.txt
new file mode 100644
index 000000000000..90fa7da525b8
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/tegra20-apbdma.txt
@@ -0,0 +1,30 @@
+* NVIDIA Tegra APB DMA controller
+Required properties:
+- compatible: Should be "nvidia,<chip>-apbdma"
+- reg: Should contain DMA registers location and length. This shuld include
+  all of the per-channel registers.
+- interrupts: Should contain all of the per-channel DMA interrupts.
+Examples:
+apbdma: dma@6000a000 {
+        compatible = "nvidia,tegra20-apbdma";
+        reg = <0x6000a000 0x1200>;
+        interrupts = < 0 136 0x04
+                       0 137 0x04
+                       0 138 0x04
+                       0 139 0x04
+                       0 140 0x04
+                       0 141 0x04
+                       0 142 0x04
+                       0 143 0x04
+                       0 144 0x04
+                       0 145 0x04
+                       0 146 0x04
+                       0 147 0x04
+                       0 148 0x04
+                       0 149 0x04
+                       0 150 0x04
+                       0 151 0x04 >;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio-omap.txt b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
new file mode 100644
index 000000000000..bff51a2fee1e
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@ -0,0 +1,36 @@
+OMAP GPIO controller bindings
+Required properties:
+- compatible:
+  - "ti,omap2-gpio" for OMAP2 controllers
+  - "ti,omap3-gpio" for OMAP3 controllers
+  - "ti,omap4-gpio" for OMAP4 controllers
+- #gpio-cells : Should be two.
+  - first cell is the pin number
+  - second cell is used to specify optional parameters (unused)
+- gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+- interrupt-controller: Mark the device node as an interrupt controller
+  The first cell is the GPIO number.
+  The second cell is used to specify flags:
+    bits[3:0] trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
+OMAP specific properties:
+- ti,hwmods: Name of the hwmod associated to the GPIO:
+  "gpio<X>", <X> being the 1-based instance number from the HW spec
+Example:
+gpio4: gpio4 {
+    compatible = "ti,omap4-gpio";
+    ti,hwmods = "gpio4";
+    #gpio-cells = <2>;
+    gpio-controller;
+    #interrupt-cells = <2>;
+    interrupt-controller;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio-twl4030.txt b/Documentation/devicetree/bindings/gpio/gpio-twl4030.txt
new file mode 100644
index 000000000000..16695d9cf1e8
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio-twl4030.txt
@@ -0,0 +1,23 @@
+twl4030 GPIO controller bindings
+Required properties:
+- compatible:
+  - "ti,twl4030-gpio" for twl4030 GPIO controller
+- #gpio-cells : Should be two.
+  - first cell is the pin number
+  - second cell is used to specify optional parameters (unused)
+- gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+- interrupt-controller: Mark the device node as an interrupt controller
+  The first cell is the GPIO number.
+  The second cell is not used.
+Example:
+twl_gpio: gpio {
+    compatible = "ti,twl4030-gpio";
+    #gpio-cells = <2>;
+    gpio-controller;
+    #interrupt-cells = <2>;
+    interrupt-controller;
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio_atmel.txt b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt
new file mode 100644
index 000000000000..66efc804806a
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio_atmel.txt
@@ -0,0 +1,20 @@
+* Atmel GPIO controller (PIO)
+Required properties:
+- compatible: "atmel,<chip>-gpio", where <chip> is at91rm9200 or at91sam9x5.
+- reg: Should contain GPIO controller registers location and length
+- interrupts: Should be the port interrupt shared by all the pins.
+- #gpio-cells: Should be two.  The first cell is the pin number and
+  the second cell is used to specify optional parameters (currently
+  unused).
+- gpio-controller: Marks the device node as a GPIO controller.
+Example:
+        pioA: gpio@fffff200 {
+                compatible = "atmel,at91rm9200-gpio";
+                reg = <0xfffff200 0x100>;
+                interrupts = <2 4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+        };
diff --git a/Documentation/devicetree/bindings/gpio/gpio_i2c.txt b/Documentation/devicetree/bindings/gpio/gpio_i2c.txt
new file mode 100644
index 000000000000..4f8ec947c6bd
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/gpio_i2c.txt
@@ -0,0 +1,32 @@
+Device-Tree bindings for i2c gpio driver
+Required properties:
+        - compatible = "i2c-gpio";
+        - gpios: sda and scl gpio
+Optional properties:
+        - i2c-gpio,sda-open-drain: sda as open drain
+        - i2c-gpio,scl-open-drain: scl as open drain
+        - i2c-gpio,scl-output-only: scl as output only
+        - i2c-gpio,delay-us: delay between GPIO operations (may depend on each platform)
+        - i2c-gpio,timeout-ms: timeout to get data
+Example nodes:
+i2c@0 {
+        compatible = "i2c-gpio";
+        gpios = <&pioA 23 0 /* sda */
+                 &pioA 24 0 /* scl */
+                >;
+        i2c-gpio,sda-open-drain;
+        i2c-gpio,scl-open-drain;
+        i2c-gpio,delay-us = <2>;        /* ~100 kHz */
+        #address-cells = <1>;
+        #size-cells = <0>;
+        rv3029c2@56 {
+                compatible = "rv3029c2";
+                reg = <0x56>;
+        };
+};
diff --git a/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt b/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
index eb4b530d64e1..023c9526e5f8 100644
--- a/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
+++ b/Documentation/devicetree/bindings/gpio/gpio_nvidia.txt
@@ -1,8 +1,40 @@
-NVIDIA Tegra 2 GPIO controller
+NVIDIA Tegra GPIO controller
 Required properties:
- compatible : "nvidia,tegra20-gpio"
+- compatible : "nvidia,tegra<chip>-gpio"
+- reg : Physical base address and length of the controller's registers.
+- interrupts : The interrupt outputs from the controller. For Tegra20,
+  there should be 7 interrupts specified, and for Tegra30, there should
+  be 8 interrupts specified.
 - #gpio-cells : Should be two. The first cell is the pin number and the
  second cell is used to specify optional parameters:
  - bit 0 specifies polarity (0 for normal, 1 for inverted)
 - gpio-controller : Marks the device node as a GPIO controller.
+- #interrupt-cells : Should be 2.
+  The first cell is the GPIO number.
+  The second cell is used to specify flags:
+    bits[3:0] trigger type and level flags:
+      1 = low-to-high edge triggered.
+      2 = high-to-low edge triggered.
+      4 = active high level-sensitive.
+      8 = active low level-sensitive.
+      Valid combinations are 1, 2, 3, 4, 8.
+- interrupt-controller : Marks the device node as an interrupt controller.
+Example:
+gpio: gpio@6000d000 {
+        compatible = "nvidia,tegra20-gpio";
+        reg = < 0x6000d000 0x1000 >;
+        interrupts = < 0 32 0x04
+                       0 33 0x04
+                       0 34 0x04
+                       0 35 0x04
+                       0 55 0x04
+                       0 87 0x04
+                       0 89 0x04 >;
+        #gpio-cells = <2>;
+        gpio-controller;
+        #interrupt-cells = <2>;
+        interrupt-controller;
+};
diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
new file mode 100644
index 000000000000..1e34cfe5ebea
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.txt
@@ -0,0 +1,23 @@
+* Marvell PXA GPIO controller
+Required properties:
+- compatible : Should be "mrvl,pxa-gpio" or "mrvl,mmp-gpio"
+- reg : Address and length of the register set for the device
+- interrupts : Should be the port interrupt shared by all gpio pins, if
+- interrupt-name : Should be the name of irq resource.
+  one number.
+- gpio-controller : Marks the device node as a gpio controller.
+- #gpio-cells : Should be one.  It is the pin number.
+Example:
+        gpio: gpio@d4019000 {
+                compatible = "mrvl,mmp-gpio", "mrvl,pxa-gpio";
+                reg = <0xd4019000 0x1000>;
+                interrupts = <49>, <17>, <18>;
+                interrupt-name = "gpio_mux", "gpio0", "gpio1";
+                gpio-controller;
+                #gpio-cells = <1>;
+                interrupt-controller;
+                #interrupt-cells = <1>;
+      };
diff --git a/Documentation/devicetree/bindings/gpio/sodaville.txt b/Documentation/devicetree/bindings/gpio/sodaville.txt
new file mode 100644
index 000000000000..563eff22b975
--- /dev/null
+++ b/Documentation/devicetree/bindings/gpio/sodaville.txt
@@ -0,0 +1,48 @@
+GPIO controller on CE4100 / Sodaville SoCs
+==========================================
+The bindings for CE4100's GPIO controller match the generic description
+which is covered by the gpio.txt file in this folder.
+The only additional property is the intel,muxctl property which holds the
+value which is written into the MUXCNTL register.
+There is no compatible property for now because the driver is probed via
+PCI id (vendor 0x8086 device 0x2e67).
+The interrupt specifier consists of two cells encoded as follows:
+ - <1st cell>: The interrupt-number that identifies the interrupt source.
+ - <2nd cell>: The level-sense information, encoded as follows:
+                4 - active high level-sensitive
+                8 - active low level-sensitive
+Example of the GPIO device and one user:
+        pcigpio: gpio@b,1 {
+                        /* two cells for GPIO and interrupt */
+                        #gpio-cells = <2>;
+                        #interrupt-cells = <2>;
+                        compatible = "pci8086,2e67.2",
+                                           "pci8086,2e67",
+                                           "pciclassff0000",
+                                           "pciclassff00";
+                        reg = <0x15900 0x0 0x0 0x0 0x0>;
+                        /* Interrupt line of the gpio device */
+                        interrupts = <15 1>;
+                        /* It is an interrupt and GPIO controller itself */
+                        interrupt-controller;
+                        gpio-controller;
+                        intel,muxctl = <0>;
+        };
+        testuser@20 {
+                        compatible = "example,testuser";
+                        /* User the 11th GPIO line as an active high triggered
+                         * level interrupt
+                         */
+                        interrupts = <11 8>;
+                        interrupt-parent = <&pcigpio>;
+                        /* Use this GPIO also with the gpio functions */
+                        gpios = <&pcigpio 11 0>;
+        };
diff --git a/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt b/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt
new file mode 100644
index 000000000000..071eb3caae91
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/mrvl-i2c.txt
@@ -0,0 +1,37 @@
+* I2C
+Required properties :
+ - reg : Offset and length of the register set for the device
+ - compatible : should be "mrvl,mmp-twsi" where CHIP is the name of a
+   compatible processor, e.g. pxa168, pxa910, mmp2, mmp3.
+   For the pxa2xx/pxa3xx, an additional node "mrvl,pxa-i2c" is required
+   as shown in the example below.
+Recommended properties :
+ - interrupts : <a b> where a is the interrupt number and b is a
+   field that represents an encoding of the sense and level
+   information for the interrupt.  This should be encoded based on
+   the information in section 2) depending on the type of interrupt
+   controller you have.
+ - interrupt-parent : the phandle for the interrupt controller that
+   services interrupts for this device.
+ - mrvl,i2c-polling : Disable interrupt of i2c controller. Polling
+   status register of i2c controller instead.
+ - mrvl,i2c-fast-mode : Enable fast mode of i2c controller.
+Examples:
+        twsi1: i2c@d4011000 {
+                compatible = "mrvl,mmp-twsi", "mrvl,pxa-i2c";
+                reg = <0xd4011000 0x1000>;
+                interrupts = <7>;
+                mrvl,i2c-fast-mode;
+        };
+        
+        twsi2: i2c@d4025000 {
+                compatible = "mrvl,mmp-twsi", "mrvl,pxa-i2c";
+                reg = <0xd4025000 0x1000>;
+                interrupts = <58>;
+        };
diff --git a/Documentation/devicetree/bindings/i2c/sirf-i2c.txt b/Documentation/devicetree/bindings/i2c/sirf-i2c.txt
new file mode 100644
index 000000000000..7baf9e133fa8
--- /dev/null
+++ b/Documentation/devicetree/bindings/i2c/sirf-i2c.txt
@@ -0,0 +1,19 @@
+I2C for SiRFprimaII platforms
+Required properties :
+- compatible : Must be "sirf,prima2-i2c"
+- reg: physical base address of the controller and length of memory mapped
+     region.
+- interrupts: interrupt number to the cpu.
+Optional properties:
+- clock-frequency : Constains desired I2C/HS-I2C bus clock frequency in Hz.
+  The absence of the propoerty indicates the default frequency 100 kHz.
+Examples :
+i2c0: i2c@b00e0000 {
+    compatible = "sirf,prima2-i2c";
+    reg = <0xb00e0000 0x10000>;
+    interrupts = <24>;
+};
diff --git a/Documentation/devicetree/bindings/input/matrix-keymap.txt b/Documentation/devicetree/bindings/input/matrix-keymap.txt
new file mode 100644
index 000000000000..3cd8b98ccd2d
--- /dev/null
+++ b/Documentation/devicetree/bindings/input/matrix-keymap.txt
@@ -0,0 +1,19 @@
+A simple common binding for matrix-connected key boards. Currently targeted at
+defining the keys in the scope of linux key codes since that is a stable and
+standardized interface at this time.
+Required properties:
+- linux,keymap: an array of packed 1-cell entries containing the equivalent
+  of row, column and linux key-code. The 32-bit big endian cell is packed
+  as:
+        row << 24 | column << 16 | key-code
+Optional properties:
+Some users of this binding might choose to specify secondary keymaps for
+cases where there is a modifier key such as a Fn key. Proposed names
+for said properties are "linux,fn-keymap" or with another descriptive
+word for the modifier other from "Fn".
+Example:
+        linux,keymap = < 0x00030012
+                         0x0102003a >;
diff --git a/Documentation/devicetree/bindings/input/tegra-kbc.txt b/Documentation/devicetree/bindings/input/tegra-kbc.txt
index 5ecfa99089b4..72683be6de35 100644
--- a/Documentation/devicetree/bindings/input/tegra-kbc.txt
+++ b/Documentation/devicetree/bindings/input/tegra-kbc.txt
@@ -3,16 +3,21 @@
 Required properties:
 - compatible: "nvidia,tegra20-kbc"
-Optional properties:
+Optional properties, in addition to those specified by the shared
- debounce-delay: delay in milliseconds per row scan for debouncing
+matrix-keyboard bindings:
- repeat-delay: delay in milliseconds before repeat starts
- ghost-filter: enable ghost filtering for this device
+- linux,fn-keymap: a second keymap, same specification as the
- wakeup-source: configure keyboard as a wakeup source for suspend/resume
+  matrix-keyboard-controller spec but to be used when the KEY_FN modifier
+  key is pressed.
+- nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing
+- nvidia,repeat-delay-ms: delay in milliseconds before repeat starts
+- nvidia,ghost-filter: enable ghost filtering for this device
+- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume
 Example:
 keyboard: keyboard {
        compatible = "nvidia,tegra20-kbc";
        reg = <0x7000e200 0x100>;
-        ghost-filter;
+        nvidia,ghost-filter;
 };
diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
new file mode 100644
index 000000000000..dbd4368ab8cc
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
@@ -0,0 +1,33 @@
+* TI Highspeed MMC host controller for OMAP
+The Highspeed MMC Host Controller on TI OMAP family
+provides an interface for MMC, SD, and SDIO types of memory cards.
+Required properties:
+- compatible:
+ Should be "ti,omap2-hsmmc", for OMAP2 controllers
+ Should be "ti,omap3-hsmmc", for OMAP3 controllers
+ Should be "ti,omap4-hsmmc", for OMAP4 controllers
+- ti,hwmods: Must be "mmc<n>", n is controller instance starting 1
+- reg : should contain hsmmc registers location and length
+Optional properties:
+ti,dual-volt: boolean, supports dual voltage cards
+<supply-name>-supply: phandle to the regulator device tree node
+"supply-name" examples are "vmmc", "vmmc_aux" etc
+ti,bus-width: Number of data lines, default assumed is 1 if the property is missing.
+cd-gpios: GPIOs for card detection
+wp-gpios: GPIOs for write protection
+ti,non-removable: non-removable slot (like eMMC)
+ti,needs-special-reset: Requires a special softreset sequence
+Example:
+        mmc1: mmc@0x4809c000 {
+                compatible = "ti,omap4-hsmmc";
+                reg = <0x4809c000 0x400>;
+                ti,hwmods = "mmc1";
+                ti,dual-volt;
+                ti,bus-width = <4>;
+                vmmc-supply = <&vmmc>; /* phandle to regulator node */
+                ti,non-removable;
+        };
diff --git a/Documentation/devicetree/bindings/mtd/atmel-nand.txt b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
new file mode 100644
index 000000000000..5903ecf6e895
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/atmel-nand.txt
@@ -0,0 +1,41 @@
+Atmel NAND flash
+Required properties:
+- compatible : "atmel,at91rm9200-nand".
+- reg : should specify localbus address and size used for the chip,
+        and if availlable the ECC.
+- atmel,nand-addr-offset : offset for the address latch.
+- atmel,nand-cmd-offset : offset for the command latch.
+- #address-cells, #size-cells : Must be present if the device has sub-nodes
+  representing partitions.
+- gpios : specifies the gpio pins to control the NAND device. detect is an
+  optional gpio and may be set to 0 if not present.
+Optional properties:
+- nand-ecc-mode : String, operation mode of the NAND ecc mode, soft by default.
+  Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+  "soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
+Examples:
+nand0: nand@40000000,0 {
+        compatible = "atmel,at91rm9200-nand";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        reg = <0x40000000 0x10000000
+               0xffffe800 0x200
+              >;
+        atmel,nand-addr-offset = <21>;
+        atmel,nand-cmd-offset = <22>;
+        nand-on-flash-bbt;
+        nand-ecc-mode = "soft";
+        gpios = <&pioC 13 0
+                 &pioC 14 0
+                 0
+                >;
+        partition@0 {
+                ...
+        };
+};
diff --git a/Documentation/devicetree/bindings/mtd/nand.txt b/Documentation/devicetree/bindings/mtd/nand.txt
new file mode 100644
index 000000000000..03855c8c492a
--- /dev/null
+++ b/Documentation/devicetree/bindings/mtd/nand.txt
@@ -0,0 +1,7 @@
+* MTD generic binding
+- nand-ecc-mode : String, operation mode of the NAND ecc mode.
+  Supported values are: "none", "soft", "hw", "hw_syndrome", "hw_oob_first",
+  "soft_bch".
+- nand-bus-width : 8 or 16 bus width if not present 8
+- nand-on-flash-bbt: boolean to enable on flash bbt option if not present false
diff --git a/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt
new file mode 100644
index 000000000000..0cda19ad4859
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt
@@ -0,0 +1,17 @@
+* Marvell Real Time Clock controller
+Required properties:
+- compatible: should be "mrvl,sa1100-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: Should be two. The first interrupt number is the rtc alarm
+  interrupt and the second interrupt number is the rtc hz interrupt.
+- interrupt-names: Assign name of irq resource.
+Example:
+        rtc: rtc@d4010000 {
+                compatible = "mrvl,mmp-rtc";
+                reg = <0xd4010000 0x1000>;
+                interrupts = <5>, <6>;
+                interrupt-name = "rtc 1Hz", "rtc alarm";
+        };
diff --git a/Documentation/devicetree/bindings/serial/mrvl-serial.txt b/Documentation/devicetree/bindings/serial/mrvl-serial.txt
new file mode 100644
index 000000000000..d744340de887
--- /dev/null
+++ b/Documentation/devicetree/bindings/serial/mrvl-serial.txt
@@ -0,0 +1,4 @@
+PXA UART controller
+Required properties:
+- compatible : should be "mrvl,mmp-uart" or "mrvl,pxa-uart".
diff --git a/Documentation/devicetree/bindings/sound/alc5632.txt b/Documentation/devicetree/bindings/sound/alc5632.txt
new file mode 100644
index 000000000000..8608f747dcfe
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/alc5632.txt
@@ -0,0 +1,24 @@
+ALC5632 audio CODEC
+This device supports I2C only.
+Required properties:
+  - compatible : "realtek,alc5632"
+  - reg : the I2C address of the device.
+  - gpio-controller : Indicates this device is a GPIO controller.
+  - #gpio-cells : Should be two. The first cell is the pin number and the
+    second cell is used to specify optional parameters (currently unused).
+Example:
+alc5632: alc5632@1e {
+        compatible = "realtek,alc5632";
+        reg = <0x1a>;
+        gpio-controller;
+        #gpio-cells = <2>;
+};
diff --git a/Documentation/devicetree/bindings/sound/imx-audmux.txt b/Documentation/devicetree/bindings/sound/imx-audmux.txt
new file mode 100644
index 000000000000..215aa9817213
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/imx-audmux.txt
@@ -0,0 +1,13 @@
+Freescale Digital Audio Mux (AUDMUX) device
+Required properties:
+- compatible : "fsl,imx21-audmux" for AUDMUX version firstly used on i.MX21,
+  or "fsl,imx31-audmux" for the version firstly used on i.MX31.
+- reg : Should contain AUDMUX registers location and length
+Example:
+audmux@021d8000 {
+        compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux";
+        reg = <0x021d8000 0x4000>;
+};
diff --git a/Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt
index 2c3cd413f042..2c3cd413f042 100644
--- a/Documentation/devicetree/bindings/sound/soc/codecs/fsl-sgtl5000.txt
+++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt
diff --git a/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt b/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt
new file mode 100644
index 000000000000..b77a97c9101e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/tegra-audio-alc5632.txt
@@ -0,0 +1,59 @@
+NVIDIA Tegra audio complex
+Required properties:
+- compatible : "nvidia,tegra-audio-alc5632"
+- nvidia,model : The user-visible name of this sound complex.
+- nvidia,audio-routing : A list of the connections between audio components.
+  Each entry is a pair of strings, the first being the connection's sink,
+  the second being the connection's source. Valid names for sources and
+  sinks are the ALC5632's pins:
+  ALC5632 pins:
+  * SPK_OUTP
+  * SPK_OUTN
+  * HP_OUT_L
+  * HP_OUT_R
+  * AUX_OUT_P
+  * AUX_OUT_N
+  * LINE_IN_L
+  * LINE_IN_R
+  * PHONE_P
+  * PHONE_N
+  * MIC1_P
+  * MIC1_N
+  * MIC2_P
+  * MIC2_N
+  * MICBIAS1
+  * DMICDAT
+  Board connectors:
+  * Headset Stereophone
+  * Int Spk
+  * Headset Mic
+  * Digital Mic
+- nvidia,i2s-controller : The phandle of the Tegra I2S controller
+- nvidia,audio-codec : The phandle of the ALC5632 audio codec
+Example:
+sound {
+        compatible = "nvidia,tegra-audio-alc5632-paz00",
+                                 "nvidia,tegra-audio-alc5632";
+        nvidia,model = "Compal PAZ00";
+        nvidia,audio-routing =
+                                "Int Spk", "SPK_OUTP",
+                                "Int Spk", "SPK_OUTN",
+                                "Headset Mic","MICBIAS1",
+                                "MIC1_N", "Headset Mic",
+                                "MIC1_P", "Headset Mic",
+                                "Headset Stereophone", "HP_OUT_R",
+                                "Headset Stereophone", "HP_OUT_L";
+        nvidia,i2s-controller = <&tegra_i2s1>;
+        nvidia,audio-codec = <&alc5632>;
+};
diff --git a/Documentation/devicetree/bindings/usb/atmel-usb.txt b/Documentation/devicetree/bindings/usb/atmel-usb.txt
new file mode 100644
index 000000000000..60bd2150a3e6
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/atmel-usb.txt
@@ -0,0 +1,49 @@
+Atmel SOC USB controllers
+OHCI
+Required properties:
+ - compatible: Should be "atmel,at91rm9200-ohci" for USB controllers
+   used in host mode.
+ - num-ports: Number of ports.
+ - atmel,vbus-gpio: If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
+ - atmel,oc-gpio: If present, specifies a gpio that needs to be
+   activated for the overcurrent detection.
+usb0: ohci@00500000 {
+        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
+        reg = <0x00500000 0x100000>;
+        interrupts = <20 4>;
+        num-ports = <2>;
+};
+EHCI
+Required properties:
+ - compatible: Should be "atmel,at91sam9g45-ehci" for USB controllers
+   used in host mode.
+usb1: ehci@00800000 {
+        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
+        reg = <0x00800000 0x100000>;
+        interrupts = <22 4>;
+};
+AT91 USB device controller
+Required properties:
+ - compatible: Should be "atmel,at91rm9200-udc"
+ - reg: Address and length of the register set for the device
+ - interrupts: Should contain macb interrupt
+Optional properties:
+ - atmel,vbus-gpio: If present, specifies a gpio that needs to be
+   activated for the bus to be powered.
+usb1: gadget@fffa4000 {
+        compatible = "atmel,at91rm9200-udc";
+        reg = <0xfffa4000 0x4000>;
+        interrupts = <10 4>;
+        atmel,vbus-gpio = <&pioC 5 0>;
+};
diff --git a/Documentation/devicetree/bindings/usb/tegra-usb.txt b/Documentation/devicetree/bindings/usb/tegra-usb.txt
index 035d63d5646d..007005ddbe12 100644
--- a/Documentation/devicetree/bindings/usb/tegra-usb.txt
+++ b/Documentation/devicetree/bindings/usb/tegra-usb.txt
@@ -11,3 +11,16 @@ Required properties :
 - phy_type : Should be one of "ulpi" or "utmi".
 - nvidia,vbus-gpio : If present, specifies a gpio that needs to be
   activated for the bus to be powered.
+Optional properties:
+  - dr_mode : dual role mode. Indicates the working mode for
+   nvidia,tegra20-ehci compatible controllers.  Can be "host", "peripheral",
+   or "otg".  Default to "host" if not defined for backward compatibility.
+      host means this is a host controller
+      peripheral means it is device controller
+      otg means it can operate as either ("on the go")
+  - nvidia,has-legacy-mode : boolean indicates whether this controller can
+    operate in legacy mode (as APX 2500 / 2600). In legacy mode some
+    registers are accessed through the APB_MISC base address instead of
+    the USB controller. Since this is a legacy issue it probably does not
+    warrant a compatible string of its own.
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index a20008ab319a..82ac057a24a9 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -34,6 +34,7 @@ picochip	Picochip Ltd
 powervr Imagination Technologies
 qcom    Qualcomm, Inc.
 ramtron Ramtron International
+realtek Realtek Semiconductor Corp.
 samsung Samsung Semiconductor
 sbs     Smart Battery System
 schindler       Schindler
diff --git a/Documentation/dma-buf-sharing.txt b/Documentation/dma-buf-sharing.txt
index 225f96d88f55..3bbd5c51605a 100644
--- a/Documentation/dma-buf-sharing.txt
+++ b/Documentation/dma-buf-sharing.txt
@@ -32,8 +32,12 @@ The buffer-user
 *IMPORTANT*: [see https://lkml.org/lkml/2011/12/20/211 for more details]
 For this first version, A buffer shared using the dma_buf sharing API:
 - *may* be exported to user space using "mmap" *ONLY* by exporter, outside of
-   this framework.
+  this framework.
- may be used *ONLY* by importers that do not need CPU access to the buffer.
+- with this new iteration of the dma-buf api cpu access from the kernel has been
+  enable, see below for the details.
+dma-buf operations for device dma only
+--------------------------------------
 The dma_buf buffer sharing API usage contains the following steps:
@@ -219,10 +223,120 @@ NOTES:
   If the exporter chooses not to allow an attach() operation once a
   map_dma_buf() API has been called, it simply returns an error.
-Miscellaneous notes:
+Kernel cpu access to a dma-buf buffer object
+--------------------------------------------
+The motivation to allow cpu access from the kernel to a dma-buf object from the
+importers side are:
+- fallback operations, e.g. if the devices is connected to a usb bus and the
+  kernel needs to shuffle the data around first before sending it away.
+- full transparency for existing users on the importer side, i.e. userspace
+  should not notice the difference between a normal object from that subsystem
+  and an imported one backed by a dma-buf. This is really important for drm
+  opengl drivers that expect to still use all the existing upload/download
+  paths.
+Access to a dma_buf from the kernel context involves three steps:
+1. Prepare access, which invalidate any necessary caches and make the object
+   available for cpu access.
+2. Access the object page-by-page with the dma_buf map apis
+3. Finish access, which will flush any necessary cpu caches and free reserved
+   resources.
+1. Prepare access
+   Before an importer can access a dma_buf object with the cpu from the kernel
+   context, it needs to notify the exporter of the access that is about to
+   happen.
+   Interface:
+      int dma_buf_begin_cpu_access(struct dma_buf *dmabuf,
+                                   size_t start, size_t len,
+                                   enum dma_data_direction direction)
+   This allows the exporter to ensure that the memory is actually available for
+   cpu access - the exporter might need to allocate or swap-in and pin the
+   backing storage. The exporter also needs to ensure that cpu access is
+   coherent for the given range and access direction. The range and access
+   direction can be used by the exporter to optimize the cache flushing, i.e.
+   access outside of the range or with a different direction (read instead of
+   write) might return stale or even bogus data (e.g. when the exporter needs to
+   copy the data to temporary storage).
+   This step might fail, e.g. in oom conditions.
+2. Accessing the buffer
+   To support dma_buf objects residing in highmem cpu access is page-based using
+   an api similar to kmap. Accessing a dma_buf is done in aligned chunks of
+   PAGE_SIZE size. Before accessing a chunk it needs to be mapped, which returns
+   a pointer in kernel virtual address space. Afterwards the chunk needs to be
+   unmapped again. There is no limit on how often a given chunk can be mapped
+   and unmapped, i.e. the importer does not need to call begin_cpu_access again
+   before mapping the same chunk again.
+   Interfaces:
+      void *dma_buf_kmap(struct dma_buf *, unsigned long);
+      void dma_buf_kunmap(struct dma_buf *, unsigned long, void *);
+   There are also atomic variants of these interfaces. Like for kmap they
+   facilitate non-blocking fast-paths. Neither the importer nor the exporter (in
+   the callback) is allowed to block when using these.
+   Interfaces:
+      void *dma_buf_kmap_atomic(struct dma_buf *, unsigned long);
+      void dma_buf_kunmap_atomic(struct dma_buf *, unsigned long, void *);
+   For importers all the restrictions of using kmap apply, like the limited
+   supply of kmap_atomic slots. Hence an importer shall only hold onto at most 2
+   atomic dma_buf kmaps at the same time (in any given process context).
+   dma_buf kmap calls outside of the range specified in begin_cpu_access are
+   undefined. If the range is not PAGE_SIZE aligned, kmap needs to succeed on
+   the partial chunks at the beginning and end but may return stale or bogus
+   data outside of the range (in these partial chunks).
+   Note that these calls need to always succeed. The exporter needs to complete
+   any preparations that might fail in begin_cpu_access.
+3. Finish access
+   When the importer is done accessing the range specified in begin_cpu_access,
+   it needs to announce this to the exporter (to facilitate cache flushing and
+   unpinning of any pinned resources). The result of of any dma_buf kmap calls
+   after end_cpu_access is undefined.
+   Interface:
+      void dma_buf_end_cpu_access(struct dma_buf *dma_buf,
+                                  size_t start, size_t len,
+                                  enum dma_data_direction dir);
+Miscellaneous notes
+-------------------
 - Any exporters or users of the dma-buf buffer sharing framework must have
  a 'select DMA_SHARED_BUFFER' in their respective Kconfigs.
+- In order to avoid fd leaks on exec, the FD_CLOEXEC flag must be set
+  on the file descriptor.  This is not just a resource leak, but a
+  potential security hole.  It could give the newly exec'd application
+  access to buffers, via the leaked fd, to which it should otherwise
+  not be permitted access.
+  The problem with doing this via a separate fcntl() call, versus doing it
+  atomically when the fd is created, is that this is inherently racy in a
+  multi-threaded app[3].  The issue is made worse when it is library code
+  opening/creating the file descriptor, as the application may not even be
+  aware of the fd's.
+  To avoid this problem, userspace must have a way to request O_CLOEXEC
+  flag be set when the dma-buf fd is created.  So any API provided by
+  the exporting driver to create a dmabuf fd must provide a way to let
+  userspace control setting of O_CLOEXEC flag passed in to dma_buf_fd().
 References:
 [1] struct dma_buf_ops in include/linux/dma-buf.h
 [2] All interfaces mentioned above defined in include/linux/dma-buf.h
+[3] https://lwn.net/Articles/236486/
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt
index cc09187a5db7..97709e9a3076 100644
--- a/Documentation/dvb/cards.txt
+++ b/Documentation/dvb/cards.txt
@@ -119,4 +119,5 @@ o Cards based on the Phillips saa7134 PCI bridge:
  - Compro Videomate DVB-T300
  - Compro Videomate DVB-T200
  - AVerMedia AVerTVHD MCE A180
+  - KWorld PC150-U ATSC Hybrid
diff --git a/Documentation/dvb/lmedm04.txt b/Documentation/dvb/lmedm04.txt
index 10b5f0411386..f4b720a14675 100644
--- a/Documentation/dvb/lmedm04.txt
+++ b/Documentation/dvb/lmedm04.txt
@@ -66,5 +66,16 @@ dd if=US290D.sys ibs=1 skip=36856 count=3976 of=dvb-usb-lme2510-s0194.fw
 For LME2510C
 dd if=US290D.sys ibs=1 skip=33152 count=3697 of=dvb-usb-lme2510c-s0194.fw
+---------------------------------------------------------------------
+The m88rs2000 tuner driver can be found in windows/system32/drivers
+US2B0D.sys (dated 29 Jun 2010)
+dd if=US2B0D.sys ibs=1 skip=34432 count=3871 of=dvb-usb-lme2510c-rs2000.fw
+We need to modify id of rs2000 firmware or it will warm boot id 3344:1120.
+echo -ne \\xF0\\x22 | dd conv=notrunc bs=1 count=2 seek=266 of=dvb-usb-lme2510c-rs2000.fw
 Copy the firmware file(s) to /lib/firmware
diff --git a/Documentation/edac.txt b/Documentation/edac.txt
index 249822cde82b..fdcc49fad8e1 100644
--- a/Documentation/edac.txt
+++ b/Documentation/edac.txt
@@ -334,8 +334,8 @@ Sdram memory scrubbing rate:
        Reading the file will return the actual scrubbing rate employed.
-        If configuration fails or memory scrubbing is not implemented, the value
+        If configuration fails or memory scrubbing is not implemented, accessing
-        of the attribute file will be -1.
+        that attribute will fail.
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 4bfd982f8080..0cad4803ffac 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -513,20 +513,6 @@ Who:	Bjorn Helgaas <bhelgaas@google.com>
 ----------------------------
-What:   The CAP9 SoC family will be removed
-When:   3.4
-Files:  arch/arm/mach-at91/at91cap9.c
-        arch/arm/mach-at91/at91cap9_devices.c
-        arch/arm/mach-at91/include/mach/at91cap9.h
-        arch/arm/mach-at91/include/mach/at91cap9_matrix.h
-        arch/arm/mach-at91/include/mach/at91cap9_ddrsdr.h
-        arch/arm/mach-at91/board-cap9adk.c
-Why:    The code is not actively maintained and platforms are now hard to find.
-Who:    Nicolas Ferre <nicolas.ferre@atmel.com>
-        Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----------------------------
 What:   Low Performance USB Block driver ("CONFIG_BLK_DEV_UB")
 When:   3.6
 Why:    This driver provides support for USB storage devices like "USB
diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 8c10bf375c73..1b7f9acbcbbe 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -144,9 +144,6 @@ journal_async_commit	Commit block can be written to disk without waiting
                        mount the device. This will enable 'journal_checksum'
                        internally.
-journal=update          Update the ext4 file system's journal to the current
-                        format.
 journal_dev=devnum      When the external journal device's major/minor numbers
                        have changed, this option allows the user to specify
                        the new journal location.  The journal device is
@@ -356,11 +353,6 @@ nouid32			Disables 32-bit UIDs and GIDs.  This is for
                        interoperability  with  older kernels which only
                        store and expect 16-bit values.
-resize                  Allows to resize filesystem to the end of the last
-                        existing block group, further resize has to be done
-                        with resize2fs either online, or offline. It can be
-                        used only with conjunction with remount.
 block_validity          This options allows to enables/disables the in-kernel
 noblock_validity        facility for tracking filesystem metadata blocks
                        within internal data structures. This allows multi-
diff --git a/Documentation/filesystems/nfs/idmapper.txt b/Documentation/filesystems/nfs/idmapper.txt
index 120fd3cf7fd9..fe03d10bb79a 100644
--- a/Documentation/filesystems/nfs/idmapper.txt
+++ b/Documentation/filesystems/nfs/idmapper.txt
@@ -4,13 +4,21 @@ ID Mapper
 =========
 Id mapper is used by NFS to translate user and group ids into names, and to
 translate user and group names into ids.  Part of this translation involves
-performing an upcall to userspace to request the information.  Id mapper will
+performing an upcall to userspace to request the information.  There are two
-user request-key to perform this upcall and cache the result.  The program
+ways NFS could obtain this information: placing a call to /sbin/request-key
-/usr/sbin/nfs.idmap should be called by request-key, and will perform the
+or by placing a call to the rpc.idmap daemon.
-translation and initialize a key with the resulting information.
+NFS will attempt to call /sbin/request-key first.  If this succeeds, the
+result will be cached using the generic request-key cache.  This call should
+only fail if /etc/request-key.conf is not configured for the id_resolver key
+type, see the "Configuring" section below if you wish to use the request-key
+method.
+If the call to /sbin/request-key fails (if /etc/request-key.conf is not
+configured with the id_resolver key type), then the idmapper will ask the
+legacy rpc.idmap daemon for the id mapping.  This result will be stored
+in a custom NFS idmap cache.
- NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
- feature.
 ===========
 Configuring
diff --git a/Documentation/filesystems/nfs/pnfs.txt b/Documentation/filesystems/nfs/pnfs.txt
index 983e14abe7e9..c7919c6e3bea 100644
--- a/Documentation/filesystems/nfs/pnfs.txt
+++ b/Documentation/filesystems/nfs/pnfs.txt
@@ -53,3 +53,57 @@ lseg maintains an extra reference corresponding to the NFS_LSEG_VALID
 bit which holds it in the pnfs_layout_hdr's list.  When the final lseg
 is removed from the pnfs_layout_hdr's list, the NFS_LAYOUT_DESTROYED
 bit is set, preventing any new lsegs from being added.
+layout drivers
+--------------
+PNFS utilizes what is called layout drivers. The STD defines 3 basic
+layout types: "files" "objects" and "blocks". For each of these types
+there is a layout-driver with a common function-vectors table which
+are called by the nfs-client pnfs-core to implement the different layout
+types.
+Files-layout-driver code is in: fs/nfs/nfs4filelayout.c && nfs4filelayoutdev.c
+Objects-layout-deriver code is in: fs/nfs/objlayout/.. directory
+Blocks-layout-deriver code is in: fs/nfs/blocklayout/.. directory
+objects-layout setup
+--------------------
+As part of the full STD implementation the objlayoutdriver.ko needs, at times,
+to automatically login to yet undiscovered iscsi/osd devices. For this the
+driver makes up-calles to a user-mode script called *osd_login*
+The path_name of the script to use is by default:
+        /sbin/osd_login.
+This name can be overridden by the Kernel module parameter:
+        objlayoutdriver.osd_login_prog
+If Kernel does not find the osd_login_prog path it will zero it out
+and will not attempt farther logins. An admin can then write new value
+to the objlayoutdriver.osd_login_prog Kernel parameter to re-enable it.
+The /sbin/osd_login is part of the nfs-utils package, and should usually
+be installed on distributions that support this Kernel version.
+The API to the login script is as follows:
+        Usage: $0 -u <URI> -o <OSDNAME> -s <SYSTEMID>
+        Options:
+                -u              target uri e.g. iscsi://<ip>:<port>
+                                (allways exists)
+                                (More protocols can be defined in the future.
+                                 The client does not interpret this string it is
+                                 passed unchanged as recieved from the Server)
+                -o              osdname of the requested target OSD
+                                (Might be empty)
+                                (A string which denotes the OSD name, there is a
+                                 limit of 64 chars on this string)
+                -s              systemid of the requested target OSD
+                                (Might be empty)
+                                (This string, if not empty is always an hex
+                                 representation of the 20 bytes osd_system_id)
+blocks-layout setup
+-------------------
+TODO: Document the setup needs of the blocks layout driver
diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
index 792faa3c06cf..620a07844e8c 100644
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
@@ -271,9 +271,26 @@ Some platforms may also use knowledge about what GPIOs are active for
 power management, such as by powering down unused chip sectors and, more
 easily, gating off unused clocks.
-Note that requesting a GPIO does NOT cause it to be configured in any
+For GPIOs that use pins known to the pinctrl subsystem, that subsystem should
-way; it just marks that GPIO as in use.  Separate code must handle any
+be informed of their use; a gpiolib driver's .request() operation may call
-pin setup (e.g. controlling which pin the GPIO uses, pullup/pulldown).
+pinctrl_request_gpio(), and a gpiolib driver's .free() operation may call
+pinctrl_free_gpio(). The pinctrl subsystem allows a pinctrl_request_gpio()
+to succeed concurrently with a pin or pingroup being "owned" by a device for
+pin multiplexing.
+Any programming of pin multiplexing hardware that is needed to route the
+GPIO signal to the appropriate pin should occur within a GPIO driver's
+.direction_input() or .direction_output() operations, and occur after any
+setup of an output GPIO's value. This allows a glitch-free migration from a
+pin's special function to GPIO. This is sometimes required when using a GPIO
+to implement a workaround on signals typically driven by a non-GPIO HW block.
+Some platforms allow some or all GPIO signals to be routed to different pins.
+Similarly, other aspects of the GPIO or pin may need to be configured, such as
+pullup/pulldown. Platform software should arrange that any such details are
+configured prior to gpio_request() being called for those GPIOs, e.g. using
+the pinctrl subsystem's mapping table, so that GPIO users need not be aware
+of these details.
 Also note that it's your responsibility to have stopped using a GPIO
 before you free it.
@@ -302,6 +319,8 @@ where 'flags' is currently defined to specify the following properties:
        * GPIOF_INIT_LOW        - as output, set initial level to LOW
        * GPIOF_INIT_HIGH       - as output, set initial level to HIGH
+        * GPIOF_OPEN_DRAIN      - gpio pin is open drain type.
+        * GPIOF_OPEN_SOURCE     - gpio pin is open source type.
 since GPIOF_INIT_* are only valid when configured as output, so group valid
 combinations as:
@@ -310,8 +329,19 @@ combinations as:
        * GPIOF_OUT_INIT_LOW    - configured as output, initial level LOW
        * GPIOF_OUT_INIT_HIGH   - configured as output, initial level HIGH
-In the future, these flags can be extended to support more properties such
+When setting the flag as GPIOF_OPEN_DRAIN then it will assume that pins is
-as open-drain status.
+open drain type. Such pins will not be driven to 1 in output mode. It is
+require to connect pull-up on such pins. By enabling this flag, gpio lib will
+make the direction to input when it is asked to set value of 1 in output mode
+to make the pin HIGH. The pin is make to LOW by driving value 0 in output mode.
+When setting the flag as GPIOF_OPEN_SOURCE then it will assume that pins is
+open source type. Such pins will not be driven to 0 in output mode. It is
+require to connect pull-down on such pin. By enabling this flag, gpio lib will
+make the direction to input when it is asked to set value of 0 in output mode
+to make the pin LOW. The pin is make to HIGH by driving value 1 in output mode.
+In the future, these flags can be extended to support more properties.
 Further more, to ease the claim/release of multiple GPIOs, 'struct gpio' is
 introduced to encapsulate all three fields as:
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90
index 9cd14cfe6515..b466974e142f 100644
--- a/Documentation/hwmon/lm90
+++ b/Documentation/hwmon/lm90
@@ -118,6 +118,10 @@ Supported chips:
    Addresses scanned: I2C 0x48 through 0x4F
    Datasheet: Publicly available at NXP website
               http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf
+  * GMT G781
+    Prefix: 'g781'
+    Addresses scanned: I2C 0x4c, 0x4d
+    Datasheet: Not publicly available from GMT
 Author: Jean Delvare <khali@linux-fr.org>
diff --git a/Documentation/hwmon/mc13783-adc b/Documentation/hwmon/mc13783-adc
index 044531a86405..d0e7b3fa9e75 100644
--- a/Documentation/hwmon/mc13783-adc
+++ b/Documentation/hwmon/mc13783-adc
@@ -3,8 +3,11 @@ Kernel driver mc13783-adc
 Supported chips:
  * Freescale Atlas MC13783
-    Prefix: 'mc13783_adc'
+    Prefix: 'mc13783'
    Datasheet: http://www.freescale.com/files/rf_if/doc/data_sheet/MC13783.pdf?fsrch=1
+  * Freescale Atlas MC13892
+    Prefix: 'mc13892'
+    Datasheet: http://cache.freescale.com/files/analog/doc/data_sheet/MC13892.pdf?fsrch=1&sr=1
 Authors:
    Sascha Hauer <s.hauer@pengutronix.de>
@@ -13,20 +16,21 @@ Authors:
 Description
 -----------
-The Freescale MC13783 is a Power Management and Audio Circuit. Among
+The Freescale MC13783 and MC13892 are Power Management and Audio Circuits.
-other things it contains a 10-bit A/D converter. The converter has 16
+Among other things they contain a 10-bit A/D converter. The converter has 16
-channels which can be used in different modes.
+(MC13783) resp. 12 (MC13892) channels which can be used in different modes. The
-The A/D converter has a resolution of 2.25mV. Channels 0-4 have
+A/D converter has a resolution of 2.25mV.
-a dedicated meaning with chip internal scaling applied. Channels 5-7
-can be used as general purpose inputs or alternatively in a dedicated
-mode. Channels 12-15 are occupied by the touchscreen if it's active.
-Currently the driver only supports channels 2 and 5-15 with no alternative
+Some channels can be used as General Purpose inputs or in a dedicated mode with
-modes for channels 5-7.
+a chip internal scaling applied .
-See this table for the meaning of the different channels and their chip
+Currently the driver only supports the Application Supply channel (BP / BPSNS),
-internal scaling:
+the General Purpose inputs and touchscreen.
+See the following tables for the meaning of the different channels and their
+chip internal scaling:
+MC13783:
 Channel Signal                                          Input Range     Scaling
 -------------------------------------------------------------------------------
 0       Battery Voltage (BATT)                          2.50 - 4.65V    -2.40V
@@ -34,7 +38,7 @@ Channel	Signal						Input Range	Scaling
 2       Application Supply (BP)                         2.50 - 4.65V    -2.40V
 3       Charger Voltage (CHRGRAW)                       0 - 10V /       /5
                                                        0 - 20V         /10
-4       Charger Current (CHRGISNSP-CHRGISNSN)           -0.25V - 0.25V  x4
+4       Charger Current (CHRGISNSP-CHRGISNSN)           -0.25 - 0.25V   x4
 5       General Purpose ADIN5 / Battery Pack Thermistor 0 - 2.30V       No
 6       General Purpose ADIN6 / Backup Voltage (LICELL) 0 - 2.30V /     No /
                                                        1.50 - 3.50V    -1.20V
@@ -48,3 +52,23 @@ Channel	Signal						Input Range	Scaling
 13      General Purpose TSX2 / Touchscreen X-plate 2    0 - 2.30V       No
 14      General Purpose TSY1 / Touchscreen Y-plate 1    0 - 2.30V       No
 15      General Purpose TSY2 / Touchscreen Y-plate 2    0 - 2.30V       No
+MC13892:
+Channel Signal                                          Input Range     Scaling
+-------------------------------------------------------------------------------
+0       Battery Voltage (BATT)                          0 - 4.8V        /2
+1       Battery Current (BATT - BATTISNSCC)             -60 - 60 mV     x20
+2       Application Supply (BPSNS)                      0 - 4.8V        /2
+3       Charger Voltage (CHRGRAW)                       0 - 12V /       /5
+                                                        0 - 20V         /10
+4       Charger Current (CHRGISNS-BPSNS) /              -0.3 - 0.3V /   x4 /
+        Touchscreen X-plate 1                           0 - 2.4V        No
+5       General Purpose ADIN5 / Battery Pack Thermistor 0 - 2.4V        No
+6       General Purpose ADIN6 / Backup Voltage (LICELL) 0 - 2.4V /      No
+        Backup Voltage (LICELL)                         0 - 3.6V        x2/3
+7       General Purpose ADIN7 / UID / Die Temperature   0 - 2.4V /      No /
+                                                        0 - 4.8V        /2
+12      General Purpose TSX1 / Touchscreen X-plate 1    0 - 2.4V        No
+13      General Purpose TSX2 / Touchscreen X-plate 2    0 - 2.4V        No
+14      General Purpose TSY1 / Touchscreen Y-plate 1    0 - 2.4V        No
+15      General Purpose TSY2 / Touchscreen Y-plate 2    0 - 2.4V        No
diff --git a/Documentation/hwmon/mcp3021 b/Documentation/hwmon/mcp3021
new file mode 100644
index 000000000000..325fd87e81b2
--- /dev/null
+++ b/Documentation/hwmon/mcp3021
@@ -0,0 +1,22 @@
+Kernel driver MCP3021
+======================
+Supported chips:
+  * Microchip Technology MCP3021
+    Prefix: 'mcp3021'
+    Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21805a.pdf
+Author: Mingkai Hu
+Description
+-----------
+This driver implements support for the Microchip Technology MCP3021 chip.
+The Microchip Technology Inc. MCP3021 is a successive approximation A/D
+converter (ADC) with 10-bit resolution.
+This device provides one single-ended input with very low power consumption.
+Communication to the MCP3021 is performed using a 2-wire I2C compatible
+interface. Standard (100 kHz) and Fast (400 kHz) I2C modes are available.
+The default I2C device address is 0x4d (contact the Microchip factory for
+additional address options).
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801
index 2871fd500349..71f55bbcefc8 100644
--- a/Documentation/i2c/busses/i2c-i801
+++ b/Documentation/i2c/busses/i2c-i801
@@ -20,6 +20,7 @@ Supported adapters:
  * Intel Patsburg (PCH)
  * Intel DH89xxCC (PCH)
  * Intel Panther Point (PCH)
+  * Intel Lynx Point (PCH)
   Datasheets: Publicly available at the Intel website
 On Intel Patsburg and later chipsets, both the normal host SMBus controller
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 7986d79d9d17..e2f8c297a8a4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -713,6 +713,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        The filter can be disabled or changed to another
                        driver later using sysfs.
+        drm_kms_helper.edid_firmware=[<connector>:]<file>
+                        Broken monitors, graphic adapters and KVMs may
+                        send no or incorrect EDID data sets. This parameter
+                        allows to specify an EDID data set in the
+                        /lib/firmware directory that is used instead.
+                        Generic built-in EDID data sets are used, if one of
+                        edid/1024x768.bin, edid/1280x1024.bin,
+                        edid/1680x1050.bin, or edid/1920x1080.bin is given
+                        and no file with the same name exists. Details and
+                        instructions how to build your own EDID data are
+                        available in Documentation/EDID/HOWTO.txt. An EDID
+                        data set will only be used for a particular connector,
+                        if its name and a colon are prepended to the EDID
+                        name.
        dscc4.setup=    [NET]
        earlycon=       [KNL] Output early console device and options.
@@ -1071,8 +1086,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        no_x2apic_optout
                                BIOS x2APIC opt-out request will be ignored
-        inttest=        [IA-64]
        iomem=          Disable strict checking of access to MMIO memory
                strict  regions from userspace.
                relaxed
@@ -1657,6 +1670,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        of returning the full 64-bit number.
                        The default is to return 64-bit inode numbers.
+        nfs.max_session_slots=
+                        [NFSv4.1] Sets the maximum number of session slots
+                        the client will attempt to negotiate with the server.
+                        This limits the number of simultaneous RPC requests
+                        that the client can send to the NFSv4.1 server.
+                        Note that there is little point in setting this
+                        value higher than the max_tcp_slot_table_limit.
        nfs.nfs4_disable_idmapping=
                        [NFSv4] When set to the default of '1', this option
                        ensures that both the RPC level authentication
@@ -1670,6 +1691,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        back to using the idmapper.
                        To turn off this behaviour, set the value to '0'.
+        nfs.send_implementation_id =
+                        [NFSv4.1] Send client implementation identification
+                        information in exchange_id requests.
+                        If zero, no implementation identification information
+                        will be sent.
+                        The default is to send the implementation identification
+                        information.
+        objlayoutdriver.osd_login_prog=
+                        [NFS] [OBJLAYOUT] sets the pathname to the program which
+                        is used to automatically discover and login into new
+                        osd-targets. Please see:
+                        Documentation/filesystems/pnfs.txt for more explanations
        nmi_debug=      [KNL,AVR32,SH] Specify one or more actions to take
                        when a NMI is triggered.
                        Format: [state][,regs][,debounce][,die]
@@ -1833,6 +1869,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        shutdown the other cpus.  Instead use the REBOOT_VECTOR
                        irq.
+        nomodule        Disable module load
        nopat           [X86] Disable PAT (page attribute table extension of
                        pagetables) support.
@@ -2109,8 +2147,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                the default.
                                off: Turn ECRC off
                                on: Turn ECRC on.
-                realloc         reallocate PCI resources if allocations done by BIOS
+                realloc=        Enable/disable reallocating PCI bridge resources
-                                are erroneous.
+                                if allocations done by BIOS are too small to
+                                accommodate resources required by all child
+                                devices.
+                                off: Turn realloc off
+                                on: Turn realloc on
+                realloc         same as realloc=on
+                noari           do not use PCIe ARI.
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.
@@ -2118,6 +2162,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                force   Enable ASPM even on devices that claim not to support it.
                        WARNING: Forcing ASPM on may cause system lockups.
+        pcie_hp=        [PCIE] PCI Express Hotplug driver options:
+                nomsi   Do not use MSI for PCI Express Native Hotplug (this
+                        makes all PCIe ports use INTx for hotplug services).
        pcie_ports=     [PCIE] PCIe ports handling:
                auto    Ask the BIOS whether or not to use native PCIe services
                        associated with PCIe ports (PME, hot-plug, AER).  Use
diff --git a/Documentation/laptops/asus-laptop.txt b/Documentation/laptops/asus-laptop.txt
index 803e51f6768b..a1e04d679289 100644
--- a/Documentation/laptops/asus-laptop.txt
+++ b/Documentation/laptops/asus-laptop.txt
@@ -45,7 +45,7 @@ Status
 Usage
 -----
-  Try "modprobe asus_acpi". Check your dmesg (simply type dmesg). You should
+  Try "modprobe asus-laptop". Check your dmesg (simply type dmesg). You should
  see some lines like this :
      Asus Laptop Extras version 0.42
diff --git a/Documentation/laptops/sony-laptop.txt b/Documentation/laptops/sony-laptop.txt
index 2bd4e82e5d9f..0d5ac7f5287e 100644
--- a/Documentation/laptops/sony-laptop.txt
+++ b/Documentation/laptops/sony-laptop.txt
@@ -17,6 +17,11 @@ subsystem. See the logs of acpid or /proc/acpi/event and
 devices are created by the driver. Additionally, loading the driver with the
 debug option will report all events in the kernel log.
+The "scancodes" passed to the input system (that can be remapped with udev)
+are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c
+module.  For example the "FN/E" key combination (EJECTCD on some models)
+generates the scancode 20 (0x14).
 Backlight control:
 ------------------
 If your laptop model supports it, you will find sysfs files in the
diff --git a/Documentation/leds/leds-lp5521.txt b/Documentation/leds/leds-lp5521.txt
index c4d8d151e0fe..0e542ab3d4a0 100644
--- a/Documentation/leds/leds-lp5521.txt
+++ b/Documentation/leds/leds-lp5521.txt
@@ -43,17 +43,23 @@ Format: 10x mA i.e 10 means 1.0 mA
 example platform data:
 Note: chan_nr can have values between 0 and 2.
+The name of each channel can be configurable.
+If the name field is not defined, the default name will be set to 'xxxx:channelN'
+(XXXX : pdata->label or i2c client name, N : channel number)
 static struct lp5521_led_config lp5521_led_config[] = {
        {
+                .name = "red",
                .chan_nr        = 0,
                .led_current    = 50,
                .max_current    = 130,
        }, {
+                .name = "green",
                .chan_nr        = 1,
                .led_current    = 0,
                .max_current    = 130,
        }, {
+                .name = "blue",
                .chan_nr        = 2,
                .led_current    = 0,
                .max_current    = 130,
@@ -86,3 +92,60 @@ static struct lp5521_platform_data lp5521_platform_data = {
 If the current is set to 0 in the platform data, that channel is
 disabled and it is not visible in the sysfs.
+The 'update_config' : CONFIG register (ADDR 08h)
+This value is platform-specific data.
+If update_config is not defined, the CONFIG register is set with
+'LP5521_PWRSAVE_EN | LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT'.
+(Enable auto-powersave, set charge pump to auto, red to battery)
+example of update_config :
+#define LP5521_CONFIGS  (LP5521_PWM_HF | LP5521_PWRSAVE_EN | \
+                        LP5521_CP_MODE_AUTO | LP5521_R_TO_BATT | \
+                        LP5521_CLK_INT)
+static struct lp5521_platform_data lp5521_pdata = {
+        .led_config = lp5521_led_config,
+        .num_channels = ARRAY_SIZE(lp5521_led_config),
+        .clock_mode = LP5521_CLOCK_INT,
+        .update_config = LP5521_CONFIGS,
+};
+LED patterns : LP5521 has autonomous operation without external control.
+Pattern data can be defined in the platform data.
+example of led pattern data :
+/* RGB(50,5,0) 500ms on, 500ms off, infinite loop */
+static u8 pattern_red[] = {
+                0x40, 0x32, 0x60, 0x00, 0x40, 0x00, 0x60, 0x00,
+                };
+static u8 pattern_green[] = {
+                0x40, 0x05, 0x60, 0x00, 0x40, 0x00, 0x60, 0x00,
+                };
+static struct lp5521_led_pattern board_led_patterns[] = {
+        {
+                .r = pattern_red,
+                .g = pattern_green,
+                .size_r = ARRAY_SIZE(pattern_red),
+                .size_g = ARRAY_SIZE(pattern_green),
+        },
+};
+static struct lp5521_platform_data lp5521_platform_data = {
+        .led_config     = lp5521_led_config,
+        .num_channels   = ARRAY_SIZE(lp5521_led_config),
+        .clock_mode     = LP5521_CLOCK_EXT,
+        .patterns = board_led_patterns,
+        .num_patterns = ARRAY_SIZE(board_led_patterns),
+};
+Then predefined led pattern(s) can be executed via the sysfs.
+To start the pattern #1,
+# echo 1 > /sys/bus/i2c/devices/xxxx/led_pattern
+(xxxx : i2c bus & slave address)
+To end the pattern,
+# echo 0 > /sys/bus/i2c/devices/xxxx/led_pattern
diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt
index 150fd3833d0b..d97bccf46147 100644
--- a/Documentation/pinctrl.txt
+++ b/Documentation/pinctrl.txt
@@ -206,12 +206,21 @@ using a certain resistor value - pull up and pull down - so that the pin has a
 stable value when nothing is driving the rail it is connected to, or when it's
 unconnected.
-For example, a platform may do this:
+Pin configuration can be programmed either using the explicit APIs described
+immediately below, or by adding configuration entries into the mapping table;
+see section "Board/machine configuration" below.
+For example, a platform may do the following to pull up a pin to VDD:
+#include <linux/pinctrl/consumer.h>
 ret = pin_config_set("foo-dev", "FOO_GPIO_PIN", PLATFORM_X_PULL_UP);
-To pull up a pin to VDD. The pin configuration driver implements callbacks for
+The format and meaning of the configuration parameter, PLATFORM_X_PULL_UP
-changing pin configuration in the pin controller ops like this:
+above, is entirely defined by the pin controller driver.
+The pin configuration driver implements callbacks for changing pin
+configuration in the pin controller ops like this:
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinconf.h>
@@ -492,14 +501,10 @@ Definitions:
    {"map-i2c0", i2c0, pinctrl0, fi2c0, gi2c0}
  }
-  Every map must be assigned a symbolic name, pin controller and function.
+  Every map must be assigned a state name, pin controller, device and
-  The group is not compulsory - if it is omitted the first group presented by
+  function. The group is not compulsory - if it is omitted the first group
-  the driver as applicable for the function will be selected, which is
+  presented by the driver as applicable for the function will be selected,
-  useful for simple cases.
+  which is useful for simple cases.
-  The device name is present in map entries tied to specific devices. Maps
-  without device names are referred to as SYSTEM pinmuxes, such as can be taken
-  by the machine implementation on boot and not tied to any specific device.
  It is possible to map several groups to the same combination of device,
  pin controller and function. This is for cases where a certain function on
@@ -726,19 +731,19 @@ same time.
 All the above functions are mandatory to implement for a pinmux driver.
-Pinmux interaction with the GPIO subsystem
+Pin control interaction with the GPIO subsystem
-==========================================
+===============================================
-The public pinmux API contains two functions named pinmux_request_gpio()
+The public pinmux API contains two functions named pinctrl_request_gpio()
-and pinmux_free_gpio(). These two functions shall *ONLY* be called from
+and pinctrl_free_gpio(). These two functions shall *ONLY* be called from
 gpiolib-based drivers as part of their gpio_request() and
-gpio_free() semantics. Likewise the pinmux_gpio_direction_[input|output]
+gpio_free() semantics. Likewise the pinctrl_gpio_direction_[input|output]
 shall only be called from within respective gpio_direction_[input|output]
 gpiolib implementation.
 NOTE that platforms and individual drivers shall *NOT* request GPIO pins to be
-muxed in. Instead, implement a proper gpiolib driver and have that driver
+controlled e.g. muxed in. Instead, implement a proper gpiolib driver and have
-request proper muxing for its pins.
+that driver request proper muxing and other control for its pins.
 The function list could become long, especially if you can convert every
 individual pin into a GPIO pin independent of any other pins, and then try
@@ -747,7 +752,7 @@ the approach to define every pin as a function.
 In this case, the function array would become 64 entries for each GPIO
 setting and then the device functions.
-For this reason there are two functions a pinmux driver can implement
+For this reason there are two functions a pin control driver can implement
 to enable only GPIO on an individual pin: .gpio_request_enable() and
 .gpio_disable_free().
@@ -762,12 +767,12 @@ gpiolib driver and the affected GPIO range, pin offset and desired direction
 will be passed along to this function.
 Alternatively to using these special functions, it is fully allowed to use
-named functions for each GPIO pin, the pinmux_request_gpio() will attempt to
+named functions for each GPIO pin, the pinctrl_request_gpio() will attempt to
 obtain the function "gpioN" where "N" is the global GPIO pin number if no
 special GPIO-handler is registered.
-Pinmux board/machine configuration
+Board/machine configuration
 ==================================
 Boards and machines define how a certain complete running system is put
@@ -775,27 +780,33 @@ together, including how GPIOs and devices are muxed, how regulators are
 constrained and how the clock tree looks. Of course pinmux settings are also
 part of this.
-A pinmux config for a machine looks pretty much like a simple regulator
+A pin controller configuration for a machine looks pretty much like a simple
-configuration, so for the example array above we want to enable i2c and
+regulator configuration, so for the example array above we want to enable i2c
-spi on the second function mapping:
+and spi on the second function mapping:
 #include <linux/pinctrl/machine.h>
-static const struct pinmux_map __initdata pmx_mapping[] = {
+static const struct pinctrl_map __initdata mapping[] = {
        {
-                .ctrl_dev_name = "pinctrl-foo",
-                .function = "spi0",
                .dev_name = "foo-spi.0",
+                .name = PINCTRL_STATE_DEFAULT,
+                .type = PIN_MAP_TYPE_MUX_GROUP,
+                .ctrl_dev_name = "pinctrl-foo",
+                .data.mux.function = "spi0",
        },
        {
-                .ctrl_dev_name = "pinctrl-foo",
-                .function = "i2c0",
                .dev_name = "foo-i2c.0",
+                .name = PINCTRL_STATE_DEFAULT,
+                .type = PIN_MAP_TYPE_MUX_GROUP,
+                .ctrl_dev_name = "pinctrl-foo",
+                .data.mux.function = "i2c0",
        },
        {
-                .ctrl_dev_name = "pinctrl-foo",
-                .function = "mmc0",
                .dev_name = "foo-mmc.0",
+                .name = PINCTRL_STATE_DEFAULT,
+                .type = PIN_MAP_TYPE_MUX_GROUP,
+                .ctrl_dev_name = "pinctrl-foo",
+                .data.mux.function = "mmc0",
        },
 };
@@ -805,21 +816,51 @@ must match a function provided by the pinmux driver handling this pin range.
 As you can see we may have several pin controllers on the system and thus
 we need to specify which one of them that contain the functions we wish
-to map. The map can also use struct device * directly, so there is no
+to map.
-inherent need to use strings to specify .dev_name or .ctrl_dev_name, these
-are for the situation where you do not have a handle to the struct device *,
-for example if they are not yet instantiated or cumbersome to obtain.
 You register this pinmux mapping to the pinmux subsystem by simply:
-       ret = pinmux_register_mappings(pmx_mapping, ARRAY_SIZE(pmx_mapping));
+       ret = pinctrl_register_mappings(mapping, ARRAY_SIZE(mapping));
 Since the above construct is pretty common there is a helper macro to make
 it even more compact which assumes you want to use pinctrl-foo and position
 0 for mapping, for example:
-static struct pinmux_map __initdata pmx_mapping[] = {
+static struct pinctrl_map __initdata mapping[] = {
-       PINMUX_MAP("I2CMAP", "pinctrl-foo", "i2c0", "foo-i2c.0"),
+        PIN_MAP_MUX_GROUP("foo-i2c.o", PINCTRL_STATE_DEFAULT, "pinctrl-foo", NULL, "i2c0"),
+};
+The mapping table may also contain pin configuration entries. It's common for
+each pin/group to have a number of configuration entries that affect it, so
+the table entries for configuration reference an array of config parameters
+and values. An example using the convenience macros is shown below:
+static unsigned long i2c_grp_configs[] = {
+        FOO_PIN_DRIVEN,
+        FOO_PIN_PULLUP,
+};
+static unsigned long i2c_pin_configs[] = {
+        FOO_OPEN_COLLECTOR,
+        FOO_SLEW_RATE_SLOW,
+};
+static struct pinctrl_map __initdata mapping[] = {
+        PIN_MAP_MUX_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", "i2c0"),
+        PIN_MAP_MUX_CONFIGS_GROUP("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0", i2c_grp_configs),
+        PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0scl", i2c_pin_configs),
+        PIN_MAP_MUX_CONFIGS_PIN("foo-i2c.0", PINCTRL_STATE_DEFAULT, "pinctrl-foo", "i2c0sda", i2c_pin_configs),
+};
+Finally, some devices expect the mapping table to contain certain specific
+named states. When running on hardware that doesn't need any pin controller
+configuration, the mapping table must still contain those named states, in
+order to explicitly indicate that the states were provided and intended to
+be empty. Table entry macro PIN_MAP_DUMMY_STATE serves the purpose of defining
+a named state without causing any pin controller to be programmed:
+static struct pinctrl_map __initdata mapping[] = {
+        PIN_MAP_DUMMY_STATE("foo-i2c.0", PINCTRL_STATE_DEFAULT),
 };
@@ -831,81 +872,96 @@ As it is possible to map a function to different groups of pins an optional
 ...
 {
+        .dev_name = "foo-spi.0",
        .name = "spi0-pos-A",
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "spi0",
        .group = "spi0_0_grp",
-        .dev_name = "foo-spi.0",
 },
 {
+        .dev_name = "foo-spi.0",
        .name = "spi0-pos-B",
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "spi0",
        .group = "spi0_1_grp",
-        .dev_name = "foo-spi.0",
 },
 ...
 This example mapping is used to switch between two positions for spi0 at
 runtime, as described further below under the heading "Runtime pinmuxing".
-Further it is possible to match several groups of pins to the same function
+Further it is possible for one named state to affect the muxing of several
-for a single device, say for example in the mmc0 example above, where you can
+groups of pins, say for example in the mmc0 example above, where you can
 additively expand the mmc0 bus from 2 to 4 to 8 pins. If we want to use all
 three groups for a total of 2+2+4 = 8 pins (for an 8-bit MMC bus as is the
 case), we define a mapping like this:
 ...
 {
+        .dev_name = "foo-mmc.0",
        .name = "2bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "mmc0",
        .group = "mmc0_1_grp",
-        .dev_name = "foo-mmc.0",
 },
 {
+        .dev_name = "foo-mmc.0",
        .name = "4bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "mmc0",
        .group = "mmc0_1_grp",
-        .dev_name = "foo-mmc.0",
 },
 {
+        .dev_name = "foo-mmc.0",
        .name = "4bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "mmc0",
        .group = "mmc0_2_grp",
-        .dev_name = "foo-mmc.0",
 },
 {
+        .dev_name = "foo-mmc.0",
        .name = "8bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
+        .function = "mmc0",
        .group = "mmc0_1_grp",
-        .dev_name = "foo-mmc.0",
 },
 {
+        .dev_name = "foo-mmc.0",
        .name = "8bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "mmc0",
        .group = "mmc0_2_grp",
-        .dev_name = "foo-mmc.0",
 },
 {
+        .dev_name = "foo-mmc.0",
        .name = "8bit"
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "mmc0",
        .group = "mmc0_3_grp",
-        .dev_name = "foo-mmc.0",
 },
 ...
 The result of grabbing this mapping from the device with something like
 this (see next paragraph):
-        pmx = pinmux_get(&device, "8bit");
+        p = pinctrl_get(dev);
+        s = pinctrl_lookup_state(p, "8bit");
+        ret = pinctrl_select_state(p, s);
+or more simply:
+        p = pinctrl_get_select(dev, "8bit");
 Will be that you activate all the three bottom records in the mapping at
-once. Since they share the same name, pin controller device, funcion and
+once. Since they share the same name, pin controller device, function and
 device, and since we allow multiple groups to match to a single device, they
 all get selected, and they all get enabled and disable simultaneously by the
 pinmux core.
@@ -914,97 +970,111 @@ pinmux core.
 Pinmux requests from drivers
 ============================
-Generally it is discouraged to let individual drivers get and enable pinmuxes.
+Generally it is discouraged to let individual drivers get and enable pin
-So if possible, handle the pinmuxes in platform code or some other place where
+control. So if possible, handle the pin control in platform code or some other
-you have access to all the affected struct device * pointers. In some cases
+place where you have access to all the affected struct device * pointers. In
-where a driver needs to switch between different mux mappings at runtime
+some cases where a driver needs to e.g. switch between different mux mappings
-this is not possible.
+at runtime this is not possible.
-A driver may request a certain mux to be activated, usually just the default
+A driver may request a certain control state to be activated, usually just the
-mux like this:
+default state like this:
-#include <linux/pinctrl/pinmux.h>
+#include <linux/pinctrl/consumer.h>
 struct foo_state {
-       struct pinmux *pmx;
+       struct pinctrl *p;
+       struct pinctrl_state *s;
       ...
 };
 foo_probe()
 {
-        /* Allocate a state holder named "state" etc */
+        /* Allocate a state holder named "foo" etc */
-        struct pinmux pmx;
+        struct foo_state *foo = ...;
+        foo->p = pinctrl_get(&device);
+        if (IS_ERR(foo->p)) {
+                /* FIXME: clean up "foo" here */
+                return PTR_ERR(foo->p);
+        }
-        pmx = pinmux_get(&device, NULL);
+        foo->s = pinctrl_lookup_state(foo->p, PINCTRL_STATE_DEFAULT);
-        if IS_ERR(pmx)
+        if (IS_ERR(foo->s)) {
-                return PTR_ERR(pmx);
+                pinctrl_put(foo->p);
-        pinmux_enable(pmx);
+                /* FIXME: clean up "foo" here */
+                return PTR_ERR(s);
+        }
-        state->pmx = pmx;
+        ret = pinctrl_select_state(foo->s);
+        if (ret < 0) {
+                pinctrl_put(foo->p);
+                /* FIXME: clean up "foo" here */
+                return ret;
+        }
 }
 foo_remove()
 {
-        pinmux_disable(state->pmx);
+        pinctrl_put(state->p);
-        pinmux_put(state->pmx);
 }
-If you want to grab a specific mux mapping and not just the first one found for
+This get/lookup/select/put sequence can just as well be handled by bus drivers
-this device you can specify a specific mapping name, for example in the above
-example the second i2c0 setting: pinmux_get(&device, "spi0-pos-B");
-This get/enable/disable/put sequence can just as well be handled by bus drivers
 if you don't want each and every driver to handle it and you know the
 arrangement on your bus.
-The semantics of the get/enable respective disable/put is as follows:
+The semantics of the pinctrl APIs are:
+- pinctrl_get() is called in process context to obtain a handle to all pinctrl
+  information for a given client device. It will allocate a struct from the
+  kernel memory to hold the pinmux state. All mapping table parsing or similar
+  slow operations take place within this API.
- pinmux_get() is called in process context to reserve the pins affected with
+- pinctrl_lookup_state() is called in process context to obtain a handle to a
-  a certain mapping and set up the pinmux core and the driver. It will allocate
+  specific state for a the client device. This operation may be slow too.
-  a struct from the kernel memory to hold the pinmux state.
- pinmux_enable()/pinmux_disable() is quick and can be called from fastpath
+- pinctrl_select_state() programs pin controller hardware according to the
-  (irq context) when you quickly want to set up/tear down the hardware muxing
+  definition of the state as given by the mapping table. In theory this is a
-  when running a device driver. Usually it will just poke some values into a
+  fast-path operation, since it only involved blasting some register settings
-  register.
+  into hardware. However, note that some pin controllers may have their
+  registers on a slow/IRQ-based bus, so client devices should not assume they
+  can call pinctrl_select_state() from non-blocking contexts.
- pinmux_disable() is called in process context to tear down the pin requests
+- pinctrl_put() frees all information associated with a pinctrl handle.
-  and release the state holder struct for the mux setting.
-Usually the pinmux core handled the get/put pair and call out to the device
+Usually the pin control core handled the get/put pair and call out to the
-drivers bookkeeping operations, like checking available functions and the
+device drivers bookkeeping operations, like checking available functions and
-associated pins, whereas the enable/disable pass on to the pin controller
+the associated pins, whereas the enable/disable pass on to the pin controller
 driver which takes care of activating and/or deactivating the mux setting by
 quickly poking some registers.
-The pins are allocated for your device when you issue the pinmux_get() call,
+The pins are allocated for your device when you issue the pinctrl_get() call,
 after this you should be able to see this in the debugfs listing of all pins.
-System pinmux hogging
+System pin control hogging
-=====================
+==========================
-A system pinmux map entry, i.e. a pinmux setting that does not have a device
+Pin control map entries can be hogged by the core when the pin controller
-associated with it, can be hogged by the core when the pin controller is
+is registered. This means that the core will attempt to call pinctrl_get(),
-registered. This means that the core will attempt to call pinmux_get() and
+lookup_state() and select_state() on it immediately after the pin control
-pinmux_enable() on it immediately after the pin control device has been
+device has been registered.
-registered.
-This is enabled by simply setting the .hog_on_boot field in the map to true,
+This occurs for mapping table entries where the client device name is equal
-like this:
+to the pin controller device name, and the state name is PINCTRL_STATE_DEFAULT.
 {
-        .name = "POWERMAP"
+        .dev_name = "pinctrl-foo",
+        .name = PINCTRL_STATE_DEFAULT,
+        .type = PIN_MAP_TYPE_MUX_GROUP,
        .ctrl_dev_name = "pinctrl-foo",
        .function = "power_func",
-        .hog_on_boot = true,
 },
 Since it may be common to request the core to hog a few always-applicable
 mux settings on the primary pin controller, there is a convenience macro for
 this:
-PINMUX_MAP_PRIMARY_SYS_HOG("POWERMAP", "power_func")
+PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-foo", NULL /* group */, "power_func")
 This gives the exact same result as the above construction.
@@ -1016,32 +1086,47 @@ It is possible to mux a certain function in and out at runtime, say to move
 an SPI port from one set of pins to another set of pins. Say for example for
 spi0 in the example above, we expose two different groups of pins for the same
 function, but with different named in the mapping as described under
-"Advanced mapping" above. So we have two mappings named "spi0-pos-A" and
+"Advanced mapping" above. So that for an SPI device, we have two states named
-"spi0-pos-B".
+"pos-A" and "pos-B".
 This snippet first muxes the function in the pins defined by group A, enables
 it, disables and releases it, and muxes it in on the pins defined by group B:
+#include <linux/pinctrl/consumer.h>
 foo_switch()
 {
-        struct pinmux *pmx;
+        struct pinctrl *p;
+        struct pinctrl_state *s1, *s2;
+        /* Setup */
+        p = pinctrl_get(&device);
+        if (IS_ERR(p))
+                ...
+        s1 = pinctrl_lookup_state(foo->p, "pos-A");
+        if (IS_ERR(s1))
+                ...
+        s2 = pinctrl_lookup_state(foo->p, "pos-B");
+        if (IS_ERR(s2))
+                ...
        /* Enable on position A */
-        pmx = pinmux_get(&device, "spi0-pos-A");
+        ret = pinctrl_select_state(s1);
-        if IS_ERR(pmx)
+        if (ret < 0)
-                return PTR_ERR(pmx);
+            ...
-        pinmux_enable(pmx);
-        /* This releases the pins again */
+        ...
-        pinmux_disable(pmx);
-        pinmux_put(pmx);
        /* Enable on position B */
-        pmx = pinmux_get(&device, "spi0-pos-B");
+        ret = pinctrl_select_state(s2);
-        if IS_ERR(pmx)
+        if (ret < 0)
-                return PTR_ERR(pmx);
+            ...
-        pinmux_enable(pmx);
        ...
+        pinctrl_put(p);
 }
 The above has to be done from process context.
diff --git a/Documentation/remoteproc.txt b/Documentation/remoteproc.txt
new file mode 100644
index 000000000000..70a048cd3fa3
--- /dev/null
+++ b/Documentation/remoteproc.txt
@@ -0,0 +1,322 @@
+Remote Processor Framework
+1. Introduction
+Modern SoCs typically have heterogeneous remote processor devices in asymmetric
+multiprocessing (AMP) configurations, which may be running different instances
+of operating system, whether it's Linux or any other flavor of real-time OS.
+OMAP4, for example, has dual Cortex-A9, dual Cortex-M3 and a C64x+ DSP.
+In a typical configuration, the dual cortex-A9 is running Linux in a SMP
+configuration, and each of the other three cores (two M3 cores and a DSP)
+is running its own instance of RTOS in an AMP configuration.
+The remoteproc framework allows different platforms/architectures to
+control (power on, load firmware, power off) those remote processors while
+abstracting the hardware differences, so the entire driver doesn't need to be
+duplicated. In addition, this framework also adds rpmsg virtio devices
+for remote processors that supports this kind of communication. This way,
+platform-specific remoteproc drivers only need to provide a few low-level
+handlers, and then all rpmsg drivers will then just work
+(for more information about the virtio-based rpmsg bus and its drivers,
+please read Documentation/rpmsg.txt).
+Registration of other types of virtio devices is now also possible. Firmwares
+just need to publish what kind of virtio devices do they support, and then
+remoteproc will add those devices. This makes it possible to reuse the
+existing virtio drivers with remote processor backends at a minimal development
+cost.
+2. User API
+  int rproc_boot(struct rproc *rproc)
+    - Boot a remote processor (i.e. load its firmware, power it on, ...).
+      If the remote processor is already powered on, this function immediately
+      returns (successfully).
+      Returns 0 on success, and an appropriate error value otherwise.
+      Note: to use this function you should already have a valid rproc
+      handle. There are several ways to achieve that cleanly (devres, pdata,
+      the way remoteproc_rpmsg.c does this, or, if this becomes prevalent, we
+      might also consider using dev_archdata for this). See also
+      rproc_get_by_name() below.
+  void rproc_shutdown(struct rproc *rproc)
+    - Power off a remote processor (previously booted with rproc_boot()).
+      In case @rproc is still being used by an additional user(s), then
+      this function will just decrement the power refcount and exit,
+      without really powering off the device.
+      Every call to rproc_boot() must (eventually) be accompanied by a call
+      to rproc_shutdown(). Calling rproc_shutdown() redundantly is a bug.
+      Notes:
+      - we're not decrementing the rproc's refcount, only the power refcount.
+        which means that the @rproc handle stays valid even after
+        rproc_shutdown() returns, and users can still use it with a subsequent
+        rproc_boot(), if needed.
+      - don't call rproc_shutdown() to unroll rproc_get_by_name(), exactly
+        because rproc_shutdown() _does not_ decrement the refcount of @rproc.
+        To decrement the refcount of @rproc, use rproc_put() (but _only_ if
+        you acquired @rproc using rproc_get_by_name()).
+  struct rproc *rproc_get_by_name(const char *name)
+    - Find an rproc handle using the remote processor's name, and then
+      boot it. If it's already powered on, then just immediately return
+      (successfully). Returns the rproc handle on success, and NULL on failure.
+      This function increments the remote processor's refcount, so always
+      use rproc_put() to decrement it back once rproc isn't needed anymore.
+      Note: currently rproc_get_by_name() and rproc_put() are not used anymore
+      by the rpmsg bus and its drivers. We need to scrutinize the use cases
+      that still need them, and see if we can migrate them to use the non
+      name-based boot/shutdown interface.
+  void rproc_put(struct rproc *rproc)
+    - Decrement @rproc's power refcount and shut it down if it reaches zero
+      (essentially by just calling rproc_shutdown), and then decrement @rproc's
+      validity refcount too.
+      After this function returns, @rproc may _not_ be used anymore, and its
+      handle should be considered invalid.
+      This function should be called _iff_ the @rproc handle was grabbed by
+      calling rproc_get_by_name().
+3. Typical usage
+#include <linux/remoteproc.h>
+/* in case we were given a valid 'rproc' handle */
+int dummy_rproc_example(struct rproc *my_rproc)
+{
+        int ret;
+        /* let's power on and boot our remote processor */
+        ret = rproc_boot(my_rproc);
+        if (ret) {
+                /*
+                 * something went wrong. handle it and leave.
+                 */
+        }
+        /*
+         * our remote processor is now powered on... give it some work
+         */
+        /* let's shut it down now */
+        rproc_shutdown(my_rproc);
+}
+4. API for implementors
+  struct rproc *rproc_alloc(struct device *dev, const char *name,
+                                const struct rproc_ops *ops,
+                                const char *firmware, int len)
+    - Allocate a new remote processor handle, but don't register
+      it yet. Required parameters are the underlying device, the
+      name of this remote processor, platform-specific ops handlers,
+      the name of the firmware to boot this rproc with, and the
+      length of private data needed by the allocating rproc driver (in bytes).
+      This function should be used by rproc implementations during
+      initialization of the remote processor.
+      After creating an rproc handle using this function, and when ready,
+      implementations should then call rproc_register() to complete
+      the registration of the remote processor.
+      On success, the new rproc is returned, and on failure, NULL.
+      Note: _never_ directly deallocate @rproc, even if it was not registered
+      yet. Instead, if you just need to unroll rproc_alloc(), use rproc_free().
+  void rproc_free(struct rproc *rproc)
+    - Free an rproc handle that was allocated by rproc_alloc.
+      This function should _only_ be used if @rproc was only allocated,
+      but not registered yet.
+      If @rproc was already successfully registered (by calling
+      rproc_register()), then use rproc_unregister() instead.
+  int rproc_register(struct rproc *rproc)
+    - Register @rproc with the remoteproc framework, after it has been
+      allocated with rproc_alloc().
+      This is called by the platform-specific rproc implementation, whenever
+      a new remote processor device is probed.
+      Returns 0 on success and an appropriate error code otherwise.
+      Note: this function initiates an asynchronous firmware loading
+      context, which will look for virtio devices supported by the rproc's
+      firmware.
+      If found, those virtio devices will be created and added, so as a result
+      of registering this remote processor, additional virtio drivers might get
+      probed.
+  int rproc_unregister(struct rproc *rproc)
+    - Unregister a remote processor, and decrement its refcount.
+      If its refcount drops to zero, then @rproc will be freed. If not,
+      it will be freed later once the last reference is dropped.
+      This function should be called when the platform specific rproc
+      implementation decides to remove the rproc device. it should
+      _only_ be called if a previous invocation of rproc_register()
+      has completed successfully.
+      After rproc_unregister() returns, @rproc is _not_ valid anymore and
+      it shouldn't be used. More specifically, don't call rproc_free()
+      or try to directly free @rproc after rproc_unregister() returns;
+      none of these are needed, and calling them is a bug.
+      Returns 0 on success and -EINVAL if @rproc isn't valid.
+5. Implementation callbacks
+These callbacks should be provided by platform-specific remoteproc
+drivers:
+/**
+ * struct rproc_ops - platform-specific device handlers
+ * @start:      power on the device and boot it
+ * @stop:       power off the device
+ * @kick:       kick a virtqueue (virtqueue id given as a parameter)
+ */
+struct rproc_ops {
+        int (*start)(struct rproc *rproc);
+        int (*stop)(struct rproc *rproc);
+        void (*kick)(struct rproc *rproc, int vqid);
+};
+Every remoteproc implementation should at least provide the ->start and ->stop
+handlers. If rpmsg/virtio functionality is also desired, then the ->kick handler
+should be provided as well.
+The ->start() handler takes an rproc handle and should then power on the
+device and boot it (use rproc->priv to access platform-specific private data).
+The boot address, in case needed, can be found in rproc->bootaddr (remoteproc
+core puts there the ELF entry point).
+On success, 0 should be returned, and on failure, an appropriate error code.
+The ->stop() handler takes an rproc handle and powers the device down.
+On success, 0 is returned, and on failure, an appropriate error code.
+The ->kick() handler takes an rproc handle, and an index of a virtqueue
+where new message was placed in. Implementations should interrupt the remote
+processor and let it know it has pending messages. Notifying remote processors
+the exact virtqueue index to look in is optional: it is easy (and not
+too expensive) to go through the existing virtqueues and look for new buffers
+in the used rings.
+6. Binary Firmware Structure
+At this point remoteproc only supports ELF32 firmware binaries. However,
+it is quite expected that other platforms/devices which we'd want to
+support with this framework will be based on different binary formats.
+When those use cases show up, we will have to decouple the binary format
+from the framework core, so we can support several binary formats without
+duplicating common code.
+When the firmware is parsed, its various segments are loaded to memory
+according to the specified device address (might be a physical address
+if the remote processor is accessing memory directly).
+In addition to the standard ELF segments, most remote processors would
+also include a special section which we call "the resource table".
+The resource table contains system resources that the remote processor
+requires before it should be powered on, such as allocation of physically
+contiguous memory, or iommu mapping of certain on-chip peripherals.
+Remotecore will only power up the device after all the resource table's
+requirement are met.
+In addition to system resources, the resource table may also contain
+resource entries that publish the existence of supported features
+or configurations by the remote processor, such as trace buffers and
+supported virtio devices (and their configurations).
+The resource table begins with this header:
+/**
+ * struct resource_table - firmware resource table header
+ * @ver: version number
+ * @num: number of resource entries
+ * @reserved: reserved (must be zero)
+ * @offset: array of offsets pointing at the various resource entries
+ *
+ * The header of the resource table, as expressed by this structure,
+ * contains a version number (should we need to change this format in the
+ * future), the number of available resource entries, and their offsets
+ * in the table.
+ */
+struct resource_table {
+        u32 ver;
+        u32 num;
+        u32 reserved[2];
+        u32 offset[0];
+} __packed;
+Immediately following this header are the resource entries themselves,
+each of which begins with the following resource entry header:
+/**
+ * struct fw_rsc_hdr - firmware resource entry header
+ * @type: resource type
+ * @data: resource data
+ *
+ * Every resource entry begins with a 'struct fw_rsc_hdr' header providing
+ * its @type. The content of the entry itself will immediately follow
+ * this header, and it should be parsed according to the resource type.
+ */
+struct fw_rsc_hdr {
+        u32 type;
+        u8 data[0];
+} __packed;
+Some resources entries are mere announcements, where the host is informed
+of specific remoteproc configuration. Other entries require the host to
+do something (e.g. allocate a system resource). Sometimes a negotiation
+is expected, where the firmware requests a resource, and once allocated,
+the host should provide back its details (e.g. address of an allocated
+memory region).
+Here are the various resource types that are currently supported:
+/**
+ * enum fw_resource_type - types of resource entries
+ *
+ * @RSC_CARVEOUT:   request for allocation of a physically contiguous
+ *                  memory region.
+ * @RSC_DEVMEM:     request to iommu_map a memory-based peripheral.
+ * @RSC_TRACE:      announces the availability of a trace buffer into which
+ *                  the remote processor will be writing logs.
+ * @RSC_VDEV:       declare support for a virtio device, and serve as its
+ *                  virtio header.
+ * @RSC_LAST:       just keep this one at the end
+ *
+ * Please note that these values are used as indices to the rproc_handle_rsc
+ * lookup table, so please keep them sane. Moreover, @RSC_LAST is used to
+ * check the validity of an index before the lookup table is accessed, so
+ * please update it as needed.
+ */
+enum fw_resource_type {
+        RSC_CARVEOUT    = 0,
+        RSC_DEVMEM      = 1,
+        RSC_TRACE       = 2,
+        RSC_VDEV        = 3,
+        RSC_LAST        = 4,
+};
+For more details regarding a specific resource type, please see its
+dedicated structure in include/linux/remoteproc.h.
+We also expect that platform-specific resource entries will show up
+at some point. When that happens, we could easily add a new RSC_PLATFORM
+type, and hand those resources to the platform-specific rproc driver to handle.
+7. Virtio and remoteproc
+The firmware should provide remoteproc information about virtio devices
+that it supports, and their configurations: a RSC_VDEV resource entry
+should specify the virtio device id (as in virtio_ids.h), virtio features,
+virtio config space, vrings information, etc.
+When a new remote processor is registered, the remoteproc framework
+will look for its resource table and will register the virtio devices
+it supports. A firmware may support any number of virtio devices, and
+of any type (a single remote processor can also easily support several
+rpmsg virtio devices this way, if desired).
+Of course, RSC_VDEV resource entries are only good enough for static
+allocation of virtio devices. Dynamic allocations will also be made possible
+using the rpmsg bus (similar to how we already do dynamic allocations of
+rpmsg channels; read more about it in rpmsg.txt).
diff --git a/Documentation/rpmsg.txt b/Documentation/rpmsg.txt
new file mode 100644
index 000000000000..409d9f964c5b
--- /dev/null
+++ b/Documentation/rpmsg.txt
@@ -0,0 +1,293 @@
+Remote Processor Messaging (rpmsg) Framework
+Note: this document describes the rpmsg bus and how to write rpmsg drivers.
+To learn how to add rpmsg support for new platforms, check out remoteproc.txt
+(also a resident of Documentation/).
+1. Introduction
+Modern SoCs typically employ heterogeneous remote processor devices in
+asymmetric multiprocessing (AMP) configurations, which may be running
+different instances of operating system, whether it's Linux or any other
+flavor of real-time OS.
+OMAP4, for example, has dual Cortex-A9, dual Cortex-M3 and a C64x+ DSP.
+Typically, the dual cortex-A9 is running Linux in a SMP configuration,
+and each of the other three cores (two M3 cores and a DSP) is running
+its own instance of RTOS in an AMP configuration.
+Typically AMP remote processors employ dedicated DSP codecs and multimedia
+hardware accelerators, and therefore are often used to offload CPU-intensive
+multimedia tasks from the main application processor.
+These remote processors could also be used to control latency-sensitive
+sensors, drive random hardware blocks, or just perform background tasks
+while the main CPU is idling.
+Users of those remote processors can either be userland apps (e.g. multimedia
+frameworks talking with remote OMX components) or kernel drivers (controlling
+hardware accessible only by the remote processor, reserving kernel-controlled
+resources on behalf of the remote processor, etc..).
+Rpmsg is a virtio-based messaging bus that allows kernel drivers to communicate
+with remote processors available on the system. In turn, drivers could then
+expose appropriate user space interfaces, if needed.
+When writing a driver that exposes rpmsg communication to userland, please
+keep in mind that remote processors might have direct access to the
+system's physical memory and other sensitive hardware resources (e.g. on
+OMAP4, remote cores and hardware accelerators may have direct access to the
+physical memory, gpio banks, dma controllers, i2c bus, gptimers, mailbox
+devices, hwspinlocks, etc..). Moreover, those remote processors might be
+running RTOS where every task can access the entire memory/devices exposed
+to the processor. To minimize the risks of rogue (or buggy) userland code
+exploiting remote bugs, and by that taking over the system, it is often
+desired to limit userland to specific rpmsg channels (see definition below)
+it can send messages on, and if possible, minimize how much control
+it has over the content of the messages.
+Every rpmsg device is a communication channel with a remote processor (thus
+rpmsg devices are called channels). Channels are identified by a textual name
+and have a local ("source") rpmsg address, and remote ("destination") rpmsg
+address.
+When a driver starts listening on a channel, its rx callback is bound with
+a unique rpmsg local address (a 32-bit integer). This way when inbound messages
+arrive, the rpmsg core dispatches them to the appropriate driver according
+to their destination address (this is done by invoking the driver's rx handler
+with the payload of the inbound message).
+2. User API
+  int rpmsg_send(struct rpmsg_channel *rpdev, void *data, int len);
+   - sends a message across to the remote processor on a given channel.
+     The caller should specify the channel, the data it wants to send,
+     and its length (in bytes). The message will be sent on the specified
+     channel, i.e. its source and destination address fields will be
+     set to the channel's src and dst addresses.
+     In case there are no TX buffers available, the function will block until
+     one becomes available (i.e. until the remote processor consumes
+     a tx buffer and puts it back on virtio's used descriptor ring),
+     or a timeout of 15 seconds elapses. When the latter happens,
+     -ERESTARTSYS is returned.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  int rpmsg_sendto(struct rpmsg_channel *rpdev, void *data, int len, u32 dst);
+   - sends a message across to the remote processor on a given channel,
+     to a destination address provided by the caller.
+     The caller should specify the channel, the data it wants to send,
+     its length (in bytes), and an explicit destination address.
+     The message will then be sent to the remote processor to which the
+     channel belongs, using the channel's src address, and the user-provided
+     dst address (thus the channel's dst address will be ignored).
+     In case there are no TX buffers available, the function will block until
+     one becomes available (i.e. until the remote processor consumes
+     a tx buffer and puts it back on virtio's used descriptor ring),
+     or a timeout of 15 seconds elapses. When the latter happens,
+     -ERESTARTSYS is returned.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  int rpmsg_send_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst,
+                                                        void *data, int len);
+   - sends a message across to the remote processor, using the src and dst
+     addresses provided by the user.
+     The caller should specify the channel, the data it wants to send,
+     its length (in bytes), and explicit source and destination addresses.
+     The message will then be sent to the remote processor to which the
+     channel belongs, but the channel's src and dst addresses will be
+     ignored (and the user-provided addresses will be used instead).
+     In case there are no TX buffers available, the function will block until
+     one becomes available (i.e. until the remote processor consumes
+     a tx buffer and puts it back on virtio's used descriptor ring),
+     or a timeout of 15 seconds elapses. When the latter happens,
+     -ERESTARTSYS is returned.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  int rpmsg_trysend(struct rpmsg_channel *rpdev, void *data, int len);
+   - sends a message across to the remote processor on a given channel.
+     The caller should specify the channel, the data it wants to send,
+     and its length (in bytes). The message will be sent on the specified
+     channel, i.e. its source and destination address fields will be
+     set to the channel's src and dst addresses.
+     In case there are no TX buffers available, the function will immediately
+     return -ENOMEM without waiting until one becomes available.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  int rpmsg_trysendto(struct rpmsg_channel *rpdev, void *data, int len, u32 dst)
+   - sends a message across to the remote processor on a given channel,
+     to a destination address provided by the user.
+     The user should specify the channel, the data it wants to send,
+     its length (in bytes), and an explicit destination address.
+     The message will then be sent to the remote processor to which the
+     channel belongs, using the channel's src address, and the user-provided
+     dst address (thus the channel's dst address will be ignored).
+     In case there are no TX buffers available, the function will immediately
+     return -ENOMEM without waiting until one becomes available.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  int rpmsg_trysend_offchannel(struct rpmsg_channel *rpdev, u32 src, u32 dst,
+                                                        void *data, int len);
+   - sends a message across to the remote processor, using source and
+     destination addresses provided by the user.
+     The user should specify the channel, the data it wants to send,
+     its length (in bytes), and explicit source and destination addresses.
+     The message will then be sent to the remote processor to which the
+     channel belongs, but the channel's src and dst addresses will be
+     ignored (and the user-provided addresses will be used instead).
+     In case there are no TX buffers available, the function will immediately
+     return -ENOMEM without waiting until one becomes available.
+     The function can only be called from a process context (for now).
+     Returns 0 on success and an appropriate error value on failure.
+  struct rpmsg_endpoint *rpmsg_create_ept(struct rpmsg_channel *rpdev,
+                void (*cb)(struct rpmsg_channel *, void *, int, void *, u32),
+                void *priv, u32 addr);
+   - every rpmsg address in the system is bound to an rx callback (so when
+     inbound messages arrive, they are dispatched by the rpmsg bus using the
+     appropriate callback handler) by means of an rpmsg_endpoint struct.
+     This function allows drivers to create such an endpoint, and by that,
+     bind a callback, and possibly some private data too, to an rpmsg address
+     (either one that is known in advance, or one that will be dynamically
+     assigned for them).
+     Simple rpmsg drivers need not call rpmsg_create_ept, because an endpoint
+     is already created for them when they are probed by the rpmsg bus
+     (using the rx callback they provide when they registered to the rpmsg bus).
+     So things should just work for simple drivers: they already have an
+     endpoint, their rx callback is bound to their rpmsg address, and when
+     relevant inbound messages arrive (i.e. messages which their dst address
+     equals to the src address of their rpmsg channel), the driver's handler
+     is invoked to process it.
+     That said, more complicated drivers might do need to allocate
+     additional rpmsg addresses, and bind them to different rx callbacks.
+     To accomplish that, those drivers need to call this function.
+     Drivers should provide their channel (so the new endpoint would bind
+     to the same remote processor their channel belongs to), an rx callback
+     function, an optional private data (which is provided back when the
+     rx callback is invoked), and an address they want to bind with the
+     callback. If addr is RPMSG_ADDR_ANY, then rpmsg_create_ept will
+     dynamically assign them an available rpmsg address (drivers should have
+     a very good reason why not to always use RPMSG_ADDR_ANY here).
+     Returns a pointer to the endpoint on success, or NULL on error.
+  void rpmsg_destroy_ept(struct rpmsg_endpoint *ept);
+   - destroys an existing rpmsg endpoint. user should provide a pointer
+     to an rpmsg endpoint that was previously created with rpmsg_create_ept().
+  int register_rpmsg_driver(struct rpmsg_driver *rpdrv);
+   - registers an rpmsg driver with the rpmsg bus. user should provide
+     a pointer to an rpmsg_driver struct, which contains the driver's
+     ->probe() and ->remove() functions, an rx callback, and an id_table
+     specifying the names of the channels this driver is interested to
+     be probed with.
+  void unregister_rpmsg_driver(struct rpmsg_driver *rpdrv);
+   - unregisters an rpmsg driver from the rpmsg bus. user should provide
+     a pointer to a previously-registered rpmsg_driver struct.
+     Returns 0 on success, and an appropriate error value on failure.
+3. Typical usage
+The following is a simple rpmsg driver, that sends an "hello!" message
+on probe(), and whenever it receives an incoming message, it dumps its
+content to the console.
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/rpmsg.h>
+static void rpmsg_sample_cb(struct rpmsg_channel *rpdev, void *data, int len,
+                                                void *priv, u32 src)
+{
+        print_hex_dump(KERN_INFO, "incoming message:", DUMP_PREFIX_NONE,
+                                                16, 1, data, len, true);
+}
+static int rpmsg_sample_probe(struct rpmsg_channel *rpdev)
+{
+        int err;
+        dev_info(&rpdev->dev, "chnl: 0x%x -> 0x%x\n", rpdev->src, rpdev->dst);
+        /* send a message on our channel */
+        err = rpmsg_send(rpdev, "hello!", 6);
+        if (err) {
+                pr_err("rpmsg_send failed: %d\n", err);
+                return err;
+        }
+        return 0;
+}
+static void __devexit rpmsg_sample_remove(struct rpmsg_channel *rpdev)
+{
+        dev_info(&rpdev->dev, "rpmsg sample client driver is removed\n");
+}
+static struct rpmsg_device_id rpmsg_driver_sample_id_table[] = {
+        { .name = "rpmsg-client-sample" },
+        { },
+};
+MODULE_DEVICE_TABLE(rpmsg, rpmsg_driver_sample_id_table);
+static struct rpmsg_driver rpmsg_sample_client = {
+        .drv.name       = KBUILD_MODNAME,
+        .drv.owner      = THIS_MODULE,
+        .id_table       = rpmsg_driver_sample_id_table,
+        .probe          = rpmsg_sample_probe,
+        .callback       = rpmsg_sample_cb,
+        .remove         = __devexit_p(rpmsg_sample_remove),
+};
+static int __init init(void)
+{
+        return register_rpmsg_driver(&rpmsg_sample_client);
+}
+module_init(init);
+static void __exit fini(void)
+{
+        unregister_rpmsg_driver(&rpmsg_sample_client);
+}
+module_exit(fini);
+Note: a similar sample which can be built and loaded can be found
+in samples/rpmsg/.
+4. Allocations of rpmsg channels:
+At this point we only support dynamic allocations of rpmsg channels.
+This is possible only with remote processors that have the VIRTIO_RPMSG_F_NS
+virtio device feature set. This feature bit means that the remote
+processor supports dynamic name service announcement messages.
+When this feature is enabled, creation of rpmsg devices (i.e. channels)
+is completely dynamic: the remote processor announces the existence of a
+remote rpmsg service by sending a name service message (which contains
+the name and rpmsg addr of the remote service, see struct rpmsg_ns_msg).
+This message is then handled by the rpmsg bus, which in turn dynamically
+creates and registers an rpmsg channel (which represents the remote service).
+If/when a relevant rpmsg driver is registered, it will be immediately probed
+by the bus, and can then start sending messages to the remote service.
+The plan is also to add static creation of rpmsg channels via the virtio
+config space, but it's not implemented yet.
diff --git a/Documentation/scsi/LICENSE.qla2xxx b/Documentation/scsi/LICENSE.qla2xxx
index 19e7cd4bba66..ce0fdf349a81 100644
--- a/Documentation/scsi/LICENSE.qla2xxx
+++ b/Documentation/scsi/LICENSE.qla2xxx
@@ -1,48 +1,11 @@
 Copyright (c) 2003-2011 QLogic Corporation
-QLogic Linux/ESX Fibre Channel HBA Driver
+QLogic Linux FC-FCoE Driver
-This program includes a device driver for Linux 2.6/ESX that may be
+This program includes a device driver for Linux 3.x.
-distributed with QLogic hardware specific firmware binary file.
 You may modify and redistribute the device driver code under the
 GNU General Public License (a copy of which is attached hereto as
 Exhibit A) published by the Free Software Foundation (version 2).
-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.
 EXHIBIT A
diff --git a/Documentation/scsi/bfa.txt b/Documentation/scsi/bfa.txt
new file mode 100644
index 000000000000..f2d6e9d1791e
--- /dev/null
+++ b/Documentation/scsi/bfa.txt
@@ -0,0 +1,82 @@
+Linux driver for Brocade FC/FCOE adapters
+Supported Hardware
+------------------
+bfa 3.0.2.2 driver supports all Brocade FC/FCOE adapters. Below is a list of
+adapter models with corresponding PCIIDs.
+        PCIID                   Model
+        1657:0013:1657:0014     425 4Gbps dual port FC HBA
+        1657:0013:1657:0014     825 8Gbps PCIe dual port FC HBA
+        1657:0013:103c:1742     HP 82B 8Gbps PCIedual port FC HBA
+        1657:0013:103c:1744     HP 42B 4Gbps dual port FC HBA
+        1657:0017:1657:0014     415 4Gbps single port FC HBA
+        1657:0017:1657:0014     815 8Gbps single port FC HBA
+        1657:0017:103c:1741     HP 41B 4Gbps single port FC HBA
+        1657:0017:103c 1743     HP 81B 8Gbps single port FC HBA
+        1657:0021:103c:1779     804 8Gbps FC HBA for HP Bladesystem c-class
+        1657:0014:1657:0014     1010 10Gbps single port CNA - FCOE
+        1657:0014:1657:0014     1020 10Gbps dual port CNA - FCOE
+        1657:0014:1657:0014     1007 10Gbps dual port CNA - FCOE
+        1657:0014:1657:0014     1741 10Gbps dual port CNA - FCOE
+        1657:0022:1657:0024     1860 16Gbps FC HBA
+        1657:0022:1657:0022     1860 10Gbps CNA - FCOE
+Firmware download
+-----------------
+The latest Firmware package for 3.0.2.2 bfa driver can be found at:
+http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page
+and then click following respective util package link:
+        Version                 Link
+        v3.0.0.0        Linux Adapter Firmware package for RHEL 6.2, SLES 11SP2
+Configuration & Management utility download
+-------------------------------------------
+The latest driver configuration & management utility for 3.0.2.2 bfa driver can
+be found at:
+http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page
+and then click following respective util pacakge link
+        Version                 Link
+        v3.0.2.0        Linux Adapter Firmware package for RHEL 6.2, SLES 11SP2
+Documentation
+-------------
+The latest Administration's Guide, Installation and Reference Manual,
+Troubleshooting Guide, and Release Notes for the corresponding out-of-box
+driver can be found at:
+http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page
+and use the following inbox and out-of-box driver version mapping to find
+the corresponding documentation:
+        Inbox Version           Out-of-box Version
+        v3.0.2.2                v3.0.0.0
+Support
+-------
+For general product and support info, go to the Brocade website at:
+http://www.brocade.com/services-support/index.page
diff --git a/Documentation/scsi/libsas.txt b/Documentation/scsi/libsas.txt
index aa54f54c4a50..3cc9c7843e15 100644
--- a/Documentation/scsi/libsas.txt
+++ b/Documentation/scsi/libsas.txt
@@ -398,21 +398,6 @@ struct sas_task {
        task_done -- callback when the task has finished execution
 };
-When an external entity, entity other than the LLDD or the
-SAS Layer, wants to work with a struct domain_device, it
-_must_ call kobject_get() when getting a handle on the
-device and kobject_put() when it is done with the device.
-This does two things:
-     A) implements proper kfree() for the device;
-     B) increments/decrements the kref for all players:
-     domain_device
-        all domain_device's ... (if past an expander)
-            port
-                host adapter
-                     pci device
-                         and up the ladder, etc.
 DISCOVERY
 ---------
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 12e3a0fb9bec..6f75ba3b8a39 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -860,7 +860,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
    [Multiple options for each card instance]
    model       - force the model name
-    position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF)
+    position_fix - Fix DMA pointer (0 = auto, 1 = use LPIB, 2 = POSBUF,
+                   3 = VIACOMBO, 4 = COMBO)
    probe_mask  - Bitmask to probe codecs (default = -1, meaning all slots)
                  When the bit 8 (0x100) is set, the lower 8 bits are used
                  as the "fixed" codec slots; i.e. the driver probes the
@@ -925,6 +926,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
            (Usually SD_LPIB register is more accurate than the
            position buffer.)
+            position_fix=3 is specific to VIA devices.  The position
+            of the capture stream is checked from both LPIB and POSBUF
+            values.  position_fix=4 is a combination mode, using LPIB
+            for playback and POSBUF for capture.
    NB: If you get many "azx_get_response timeout" messages at
    loading, it's likely a problem of interrupts (e.g. ACPI irq
    routing).  Try to boot with options like "pci=noacpi".  Also, you
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index c8c54544abc5..d97d992ced14 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -8,37 +8,10 @@ ALC880
  5stack-digout 5-jack in back, 2-jack in front, a SPDIF out
  6stack        6-jack in back, 2-jack in front
  6stack-digout 6-jack with a SPDIF out
-  w810          3-jack
-  z71v          3-jack (HP shared SPDIF)
-  asus          3-jack (ASUS Mobo)
-  asus-w1v      ASUS W1V
-  asus-dig      ASUS with SPDIF out
-  asus-dig2     ASUS with SPDIF out (using GPIO2)
-  uniwill       3-jack
-  fujitsu       Fujitsu Laptops (Pi1536)
-  F1734         2-jack
-  lg            LG laptop (m1 express dual)
-  lg-lw         LG LW20/LW25 laptop
-  tcl           TCL S700
-  clevo         Clevo laptops (m520G, m665n)
-  medion        Medion Rim 2150
-  test          for testing/debugging purpose, almost all controls can be
-                adjusted.  Appearing only when compiled with
-                $CONFIG_SND_DEBUG=y
-  auto          auto-config reading BIOS (default)
 ALC260
 ======
-  fujitsu       Fujitsu S7020
+  N/A
-  acer          Acer TravelMate
-  will          Will laptops (PB V7900)
-  replacer      Replacer 672V
-  favorit100    Maxdata Favorit 100XS
-  basic         fixed pin assignment (old default model)
-  test          for testing/debugging purpose, almost all controls can
-                adjusted.  Appearing only when compiled with
-                $CONFIG_SND_DEBUG=y
-  auto          auto-config reading BIOS (default)
 ALC262
 ======
@@ -70,55 +43,7 @@ ALC680
 ALC882/883/885/888/889
 ======================
-  3stack-dig    3-jack with SPDIF I/O
+  N/A
-  6stack-dig    6-jack digital with SPDIF I/O
-  arima         Arima W820Di1
-  targa         Targa T8, MSI-1049 T8
-  asus-a7j      ASUS A7J
-  asus-a7m      ASUS A7M
-  macpro        MacPro support
-  mb5           Macbook 5,1
-  macmini3      Macmini 3,1
-  mba21         Macbook Air 2,1
-  mbp3          Macbook Pro rev3
-  imac24        iMac 24'' with jack detection
-  imac91        iMac 9,1
-  w2jc          ASUS W2JC
-  3stack-2ch-dig        3-jack with SPDIF I/O (ALC883)
-  alc883-6stack-dig     6-jack digital with SPDIF I/O (ALC883)
-  3stack-6ch    3-jack 6-channel
-  3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
-  6stack-dig-demo  6-jack digital for Intel demo board
-  acer          Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
-  acer-aspire   Acer Aspire 9810
-  acer-aspire-4930g Acer Aspire 4930G
-  acer-aspire-6530g Acer Aspire 6530G
-  acer-aspire-7730g Acer Aspire 7730G
-  acer-aspire-8930g Acer Aspire 8930G
-  medion        Medion Laptops
-  targa-dig     Targa/MSI
-  targa-2ch-dig Targa/MSI with 2-channel
-  targa-8ch-dig Targa/MSI with 8-channel (MSI GX620)
-  laptop-eapd   3-jack with SPDIF I/O and EAPD (Clevo M540JE, M550JE)
-  lenovo-101e   Lenovo 101E
-  lenovo-nb0763 Lenovo NB0763
-  lenovo-ms7195-dig Lenovo MS7195
-  lenovo-sky    Lenovo Sky
-  haier-w66     Haier W66
-  3stack-hp     HP machines with 3stack (Lucknow, Samba boards)
-  6stack-dell   Dell machines with 6stack (Inspiron 530)
-  mitac         Mitac 8252D
-  clevo-m540r   Clevo M540R (6ch + digital)
-  clevo-m720    Clevo M720 laptop series
-  fujitsu-pi2515 Fujitsu AMILO Pi2515
-  fujitsu-xa3530 Fujitsu AMILO XA3530
-  3stack-6ch-intel Intel DG33* boards
-  intel-alc889a Intel IbexPeak with ALC889A
-  intel-x58     Intel DX58 with ALC889
-  asus-p5q      ASUS P5Q-EM boards
-  mb31          MacBook 3,1
-  sony-vaio-tt  Sony VAIO TT
-  auto          auto-config reading BIOS (default)
 ALC861/660
 ==========
diff --git a/Documentation/sound/alsa/HD-Audio.txt b/Documentation/sound/alsa/HD-Audio.txt
index 91fee3b45fb8..7813c06a5c71 100644
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
@@ -59,7 +59,12 @@ a case, you can change the default method via `position_fix` option.
 `position_fix=1` means to use LPIB method explicitly.
 `position_fix=2` means to use the position-buffer.
 `position_fix=3` means to use a combination of both methods, needed
-for some VIA and ATI controllers.  0 is the default value for all other
+for some VIA controllers.  The capture stream position is corrected
+by comparing both LPIB and position-buffer values.
+`position_fix=4` is another combination available for all controllers,
+and uses LPIB for the playback and the position-buffer for the capture
+streams.
+0 is the default value for all other
 controllers, the automatic check and fallback to LPIB as described in
 the above.  If you get a problem of repeated sounds, this option might
 help.
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 23584d0c6a75..f316d1816fcd 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -32,3 +32,4 @@
 31 -> Leadtek Winfast PxDVR3200 H XC4000                  [107d:6f39]
 32 -> MPX-885
 33 -> Mygica X8507                                        [14f1:8502]
+ 34 -> TerraTec Cinergy T PCIe Dual                        [153b:117e]
diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index eee18e6962b6..fa4b3f947468 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -59,7 +59,7 @@
 58 -> Pinnacle PCTV HD 800i                               [11bd:0051]
 59 -> DViCO FusionHDTV 5 PCI nano                         [18ac:d530]
 60 -> Pinnacle Hybrid PCTV                                [12ab:1788]
- 61 -> Leadtek TV2000 XP Global                            [107d:6f18,107d:6618]
+ 61 -> Leadtek TV2000 XP Global                            [107d:6f18,107d:6618,107d:6619]
 62 -> PowerColor RA330                                    [14f1:ea3d]
 63 -> Geniatech X8000-MT DVBT                             [14f1:8852]
 64 -> DViCO FusionHDTV DVB-T PRO                          [18ac:db30]
@@ -87,3 +87,5 @@
 86 -> TeVii S464 DVB-S/S2                                 [d464:9022]
 87 -> Leadtek WinFast DTV2000 H PLUS                      [107d:6f42]
 88 -> Leadtek WinFast DTV1800 H (XC4000)                  [107d:6f38]
+ 89 -> Leadtek TV2000 XP Global (SC4100)                   [107d:6f36]
+ 90 -> Leadtek TV2000 XP Global (XC4100)                   [107d:6f43]
diff --git a/Documentation/video4linux/CARDLIST.em28xx b/Documentation/video4linux/CARDLIST.em28xx
index e7be3ac49ead..d99262dda533 100644
--- a/Documentation/video4linux/CARDLIST.em28xx
+++ b/Documentation/video4linux/CARDLIST.em28xx
@@ -7,7 +7,7 @@
  6 -> Terratec Cinergy 200 USB                 (em2800)
  7 -> Leadtek Winfast USB II                   (em2800)        [0413:6023]
  8 -> Kworld USB2800                           (em2800)
-  9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker  (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a]
+  9 -> Pinnacle Dazzle DVC 90/100/101/107 / Kaiser Baas Video to DVD maker  (em2820/em2840) [1b80:e302,1b80:e304,2304:0207,2304:021a,093b:a003]
 10 -> Hauppauge WinTV HVR 900                  (em2880)        [2040:6500]
 11 -> Terratec Hybrid XS                       (em2880)
 12 -> Kworld PVR TV 2800 RF                    (em2820/em2840)
@@ -61,7 +61,7 @@
 61 -> Pixelview PlayTV Box 4 USB 2.0           (em2820/em2840)
 62 -> Gadmei TVR200                            (em2820/em2840)
 63 -> Kaiomy TVnPC U2                          (em2860)        [eb1a:e303]
- 64 -> Easy Cap Capture DC-60                   (em2860)
+ 64 -> Easy Cap Capture DC-60                   (em2860)        [1b80:e309]
 65 -> IO-DATA GV-MVP/SZ                        (em2820/em2840) [04bb:0515]
 66 -> Empire dual TV                           (em2880)
 67 -> Terratec Grabby                          (em2860)        [0ccd:0096,0ccd:10AF]
@@ -76,7 +76,11 @@
 76 -> KWorld PlusTV 340U or UB435-Q (ATSC)     (em2870)        [1b80:a340]
 77 -> EM2874 Leadership ISDBT                  (em2874)
 78 -> PCTV nanoStick T2 290e                   (em28174)
- 79 -> Terratec Cinergy H5                      (em2884)        [0ccd:10a2,0ccd:10ad]
+ 79 -> Terratec Cinergy H5                      (em2884)        [0ccd:008e,0ccd:00ac,0ccd:10a2,0ccd:10ad]
 80 -> PCTV DVB-S2 Stick (460e)                 (em28174)
 81 -> Hauppauge WinTV HVR 930C                 (em2884)        [2040:1605]
 82 -> Terratec Cinergy HTC Stick               (em2884)        [0ccd:00b2]
+ 83 -> Honestech Vidbox NW03                    (em2860)        [eb1a:5006]
+ 84 -> MaxMedia UB425-TC                        (em2874)        [1b80:e425]
+ 85 -> PCTV QuatroStick (510e)                  (em2884)        [2304:0242]
+ 86 -> PCTV QuatroStick nano (520e)             (em2884)        [2013:0251]
diff --git a/Documentation/video4linux/CARDLIST.saa7134 b/Documentation/video4linux/CARDLIST.saa7134
index e7ef38a19859..34f3b330e5f4 100644
--- a/Documentation/video4linux/CARDLIST.saa7134
+++ b/Documentation/video4linux/CARDLIST.saa7134
@@ -187,3 +187,4 @@
 186 -> Beholder BeholdTV 501                    [5ace:5010]
 187 -> Beholder BeholdTV 503 FM                 [5ace:5030]
 188 -> Sensoray 811/911                         [6000:0811,6000:0911]
+189 -> Kworld PC150-U                           [17de:a134]
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 6323b7a20719..c83f6e418879 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -78,10 +78,11 @@ tuner=77 - TCL tuner MF02GIP-5N-E
 tuner=78 - Philips FMD1216MEX MK3 Hybrid Tuner
 tuner=79 - Philips PAL/SECAM multi (FM1216 MK5)
 tuner=80 - Philips FQ1216LME MK3 PAL/SECAM w/active loopthrough
-tuner=81 - Xceive 4000 tuner
 tuner=81 - Partsnic (Daewoo) PTI-5NF05
 tuner=82 - Philips CU1216L
 tuner=83 - NXP TDA18271
 tuner=84 - Sony BTF-Pxn01Z
 tuner=85 - Philips FQ1236 MK5
 tuner=86 - Tena TNF5337 MFD
+tuner=87 - Xceive 4000 tuner
+tuner=88 - Xceive 5000C tuner
diff --git a/Documentation/video4linux/fimc.txt b/Documentation/video4linux/fimc.txt
new file mode 100644
index 000000000000..eb049708f3e4
--- /dev/null
+++ b/Documentation/video4linux/fimc.txt
@@ -0,0 +1,178 @@
+Samsung S5P/EXYNOS4 FIMC driver
+Copyright (C) 2012 Samsung Electronics Co., Ltd.
+---------------------------------------------------------------------------
+The FIMC (Fully Interactive Mobile Camera) device available in Samsung
+SoC Application Processors is an integrated camera host interface, color
+space converter, image resizer and rotator.  It's also capable of capturing
+data from LCD controller (FIMD) through the SoC internal writeback data
+path.  There are multiple FIMC instances in the SoCs (up to 4), having
+slightly different capabilities, like pixel alignment constraints, rotator
+availability, LCD writeback support, etc. The driver is located at
+drivers/media/video/s5p-fimc directory.
+1. Supported SoCs
+=================
+S5PC100 (mem-to-mem only), S5PV210, EXYNOS4210
+2. Supported features
+=====================
+ - camera parallel interface capture (ITU-R.BT601/565);
+ - camera serial interface capture (MIPI-CSI2);
+ - memory-to-memory processing (color space conversion, scaling, mirror
+   and rotation);
+ - dynamic pipeline re-configuration at runtime (re-attachment of any FIMC
+   instance to any parallel video input or any MIPI-CSI front-end);
+ - runtime PM and system wide suspend/resume
+Not currently supported:
+ - LCD writeback input
+ - per frame clock gating (mem-to-mem)
+3. Files partitioning
+=====================
+- media device driver
+  drivers/media/video/s5p-fimc/fimc-mdevice.[ch]
+ - camera capture video device driver
+  drivers/media/video/s5p-fimc/fimc-capture.c
+ - MIPI-CSI2 receiver subdev
+  drivers/media/video/s5p-fimc/mipi-csis.[ch]
+ - video post-processor (mem-to-mem)
+  drivers/media/video/s5p-fimc/fimc-core.c
+ - common files
+  drivers/media/video/s5p-fimc/fimc-core.h
+  drivers/media/video/s5p-fimc/fimc-reg.h
+  drivers/media/video/s5p-fimc/regs-fimc.h
+4. User space interfaces
+========================
+4.1. Media device interface
+The driver supports Media Controller API as defined at
+http://http://linuxtv.org/downloads/v4l-dvb-apis/media_common.html
+The media device driver name is "SAMSUNG S5P FIMC".
+The purpose of this interface is to allow changing assignment of FIMC instances
+to the SoC peripheral camera input at runtime and optionally to control internal
+connections of the MIPI-CSIS device(s) to the FIMC entities.
+The media device interface allows to configure the SoC for capturing image
+data from the sensor through more than one FIMC instance (e.g. for simultaneous
+viewfinder and still capture setup).
+Reconfiguration is done by enabling/disabling media links created by the driver
+during initialization. The internal device topology can be easily discovered
+through media entity and links enumeration.
+4.2. Memory-to-memory video node
+V4L2 memory-to-memory interface at /dev/video? device node.  This is standalone
+video device, it has no media pads. However please note the mem-to-mem and
+capture video node operation on same FIMC instance is not allowed.  The driver
+detects such cases but the applications should prevent them to avoid an
+undefined behaviour.
+4.3. Capture video node
+The driver supports V4L2 Video Capture Interface as defined at:
+http://linuxtv.org/downloads/v4l-dvb-apis/devices.html
+At the capture and mem-to-mem video nodes only the multi-planar API is
+supported. For more details see:
+http://linuxtv.org/downloads/v4l-dvb-apis/planar-apis.html
+4.4. Camera capture subdevs
+Each FIMC instance exports a sub-device node (/dev/v4l-subdev?), a sub-device
+node is also created per each available and enabled at the platform level
+MIPI-CSI receiver device (currently up to two).
+4.5. sysfs
+In order to enable more precise camera pipeline control through the sub-device
+API the driver creates a sysfs entry associated with "s5p-fimc-md" platform
+device. The entry path is: /sys/platform/devices/s5p-fimc-md/subdev_conf_mode.
+In typical use case there could be a following capture pipeline configuration:
+sensor subdev -> mipi-csi subdev -> fimc subdev -> video node
+When we configure these devices through sub-device API at user space, the
+configuration flow must be from left to right, and the video node is
+configured as last one.
+When we don't use sub-device user space API the whole configuration of all
+devices belonging to the pipeline is done at the video node driver.
+The sysfs entry allows to instruct the capture node driver not to configure
+the sub-devices (format, crop), to avoid resetting the subdevs' configuration
+when the last configuration steps at the video node is performed.
+For full sub-device control support (subdevs configured at user space before
+starting streaming):
+# echo "sub-dev" > /sys/platform/devices/s5p-fimc-md/subdev_conf_mode
+For V4L2 video node control only (subdevs configured internally by the host
+driver):
+# echo "vid-dev" > /sys/platform/devices/s5p-fimc-md/subdev_conf_mode
+This is a default option.
+5. Device mapping to video and subdev device nodes
+==================================================
+There are associated two video device nodes with each device instance in
+hardware - video capture and mem-to-mem and additionally a subdev node for
+more precise FIMC capture subsystem control. In addition a separate v4l2
+sub-device node is created per each MIPI-CSIS device.
+How to find out which /dev/video? or /dev/v4l-subdev? is assigned to which
+device?
+You can either grep through the kernel log to find relevant information, i.e.
+# dmesg | grep -i fimc
+(note that udev, if present, might still have rearranged the video nodes),
+or retrieve the information from /dev/media? with help of the media-ctl tool:
+# media-ctl -p
+6. Platform support
+===================
+The machine code (plat-s5p and arch/arm/mach-*) must select following options
+CONFIG_S5P_DEV_FIMC0       mandatory
+CONFIG_S5P_DEV_FIMC1  \
+CONFIG_S5P_DEV_FIMC2  |    optional
+CONFIG_S5P_DEV_FIMC3  |
+CONFIG_S5P_SETUP_FIMC /
+CONFIG_S5P_SETUP_MIPIPHY \
+CONFIG_S5P_DEV_CSIS0     | optional for MIPI-CSI interface
+CONFIG_S5P_DEV_CSIS1     /
+Except that, relevant s5p_device_fimc? should be registered in the machine code
+in addition to a "s5p-fimc-md" platform device to which the media device driver
+is bound.  The "s5p-fimc-md" device instance is required even if only mem-to-mem
+operation is used.
+The description of sensor(s) attached to FIMC/MIPI-CSIS camera inputs should be
+passed as the "s5p-fimc-md" device platform_data.  The platform data structure
+is defined in file include/media/s5p_fimc.h.
+7. Build
+========
+This driver depends on following config options:
+PLAT_S5P,
+PM_RUNTIME,
+I2C,
+REGULATOR,
+VIDEO_V4L2_SUBDEV_API,
+If the driver is built as a loadable kernel module (CONFIG_VIDEO_SAMSUNG_S5P_FIMC=m)
+two modules are created (in addition to the core v4l2 modules): s5p-fimc.ko and
+optional s5p-csis.ko (MIPI-CSI receiver subdev).
diff --git a/Documentation/video4linux/gspca.txt b/Documentation/video4linux/gspca.txt
index f2060f0dc02c..e6c2842407a4 100644
--- a/Documentation/video4linux/gspca.txt
+++ b/Documentation/video4linux/gspca.txt
@@ -217,6 +217,7 @@ ov534_9		06f8:3003	Hercules Dualpix HD Weblog
 sonixj          06f8:3004       Hercules Classic Silver
 sonixj          06f8:3008       Hercules Deluxe Optical Glass
 pac7302         06f8:3009       Hercules Classic Link
+pac7302         06f8:301b       Hercules Link
 nw80x           0728:d001       AVerMedia Camguard
 spca508         0733:0110       ViewQuest VQ110
 spca501         0733:0401       Intel Create and Share
diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index e1d94bf4056e..6386f8c0482e 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -95,7 +95,7 @@ described as 'basic' will be available.
 Capability: basic
 Architectures: all
 Type: system ioctl
-Parameters: none
+Parameters: machine type identifier (KVM_VM_*)
 Returns: a VM fd that can be used to control the new virtual machine.
 The new VM has no virtual cpus and no memory.  An mmap() of a VM fd
@@ -103,6 +103,11 @@ will access the virtual machine's physical address space; offset zero
 corresponds to guest physical address zero.  Use of mmap() on a VM fd
 is discouraged if userspace memory allocation (KVM_CAP_USER_MEMORY) is
 available.
+You most certainly want to use 0 as machine type.
+In order to create user controlled virtual machines on S390, check
+KVM_CAP_S390_UCONTROL and use the flag KVM_VM_S390_UCONTROL as
+privileged user (CAP_SYS_ADMIN).
 4.3 KVM_GET_MSR_INDEX_LIST
@@ -213,6 +218,11 @@ allocation of vcpu ids.  For example, if userspace wants
 single-threaded guest vcpus, it should make all vcpu ids be a multiple
 of the number of vcpus per vcore.
+For virtual cpus that have been created with S390 user controlled virtual
+machines, the resulting vcpu fd can be memory mapped at page offset
+KVM_S390_SIE_PAGE_OFFSET in order to obtain a memory map of the virtual
+cpu's hardware control block.
 4.8 KVM_GET_DIRTY_LOG (vm ioctl)
 Capability: basic
@@ -1159,6 +1169,14 @@ following flags are specified:
 /* Depends on KVM_CAP_IOMMU */
 #define KVM_DEV_ASSIGN_ENABLE_IOMMU     (1 << 0)
+/* The following two depend on KVM_CAP_PCI_2_3 */
+#define KVM_DEV_ASSIGN_PCI_2_3          (1 << 1)
+#define KVM_DEV_ASSIGN_MASK_INTX        (1 << 2)
+If KVM_DEV_ASSIGN_PCI_2_3 is set, the kernel will manage legacy INTx interrupts
+via the PCI-2.3-compliant device-level mask, thus enable IRQ sharing with other
+assigned devices or host devices. KVM_DEV_ASSIGN_MASK_INTX specifies the
+guest's view on the INTx mask, see KVM_ASSIGN_SET_INTX_MASK for details.
 The KVM_DEV_ASSIGN_ENABLE_IOMMU flag is a mandatory option to ensure
 isolation of the device.  Usages not specifying this flag are deprecated.
@@ -1399,6 +1417,71 @@ The following flags are defined:
 If datamatch flag is set, the event will be signaled only if the written value
 to the registered address is equal to datamatch in struct kvm_ioeventfd.
+4.59 KVM_DIRTY_TLB
+Capability: KVM_CAP_SW_TLB
+Architectures: ppc
+Type: vcpu ioctl
+Parameters: struct kvm_dirty_tlb (in)
+Returns: 0 on success, -1 on error
+struct kvm_dirty_tlb {
+        __u64 bitmap;
+        __u32 num_dirty;
+};
+This must be called whenever userspace has changed an entry in the shared
+TLB, prior to calling KVM_RUN on the associated vcpu.
+The "bitmap" field is the userspace address of an array.  This array
+consists of a number of bits, equal to the total number of TLB entries as
+determined by the last successful call to KVM_CONFIG_TLB, rounded up to the
+nearest multiple of 64.
+Each bit corresponds to one TLB entry, ordered the same as in the shared TLB
+array.
+The array is little-endian: the bit 0 is the least significant bit of the
+first byte, bit 8 is the least significant bit of the second byte, etc.
+This avoids any complications with differing word sizes.
+The "num_dirty" field is a performance hint for KVM to determine whether it
+should skip processing the bitmap and just invalidate everything.  It must
+be set to the number of set bits in the bitmap.
+4.60 KVM_ASSIGN_SET_INTX_MASK
+Capability: KVM_CAP_PCI_2_3
+Architectures: x86
+Type: vm ioctl
+Parameters: struct kvm_assigned_pci_dev (in)
+Returns: 0 on success, -1 on error
+Allows userspace to mask PCI INTx interrupts from the assigned device.  The
+kernel will not deliver INTx interrupts to the guest between setting and
+clearing of KVM_ASSIGN_SET_INTX_MASK via this interface.  This enables use of
+and emulation of PCI 2.3 INTx disable command register behavior.
+This may be used for both PCI 2.3 devices supporting INTx disable natively and
+older devices lacking this support. Userspace is responsible for emulating the
+read value of the INTx disable bit in the guest visible PCI command register.
+When modifying the INTx disable state, userspace should precede updating the
+physical device command register by calling this ioctl to inform the kernel of
+the new intended INTx mask state.
+Note that the kernel uses the device INTx disable bit to internally manage the
+device interrupt state for PCI 2.3 devices.  Reads of this register may
+therefore not match the expected value.  Writes should always use the guest
+intended INTx disable value rather than attempting to read-copy-update the
+current physical device state.  Races between user and kernel updates to the
+INTx disable bit are handled lazily in the kernel.  It's possible the device
+may generate unintended interrupts, but they will not be injected into the
+guest.
+See KVM_ASSIGN_DEV_IRQ for the data structure.  The target device is specified
+by assigned_dev_id.  In the flags field, only KVM_DEV_ASSIGN_MASK_INTX is
+evaluated.
 4.62 KVM_CREATE_SPAPR_TCE
 Capability: KVM_CAP_SPAPR_TCE
@@ -1491,6 +1574,101 @@ following algorithm:
 Some guests configure the LINT1 NMI input to cause a panic, aiding in
 debugging.
+4.65 KVM_S390_UCAS_MAP
+Capability: KVM_CAP_S390_UCONTROL
+Architectures: s390
+Type: vcpu ioctl
+Parameters: struct kvm_s390_ucas_mapping (in)
+Returns: 0 in case of success
+The parameter is defined like this:
+        struct kvm_s390_ucas_mapping {
+                __u64 user_addr;
+                __u64 vcpu_addr;
+                __u64 length;
+        };
+This ioctl maps the memory at "user_addr" with the length "length" to
+the vcpu's address space starting at "vcpu_addr". All parameters need to
+be alligned by 1 megabyte.
+4.66 KVM_S390_UCAS_UNMAP
+Capability: KVM_CAP_S390_UCONTROL
+Architectures: s390
+Type: vcpu ioctl
+Parameters: struct kvm_s390_ucas_mapping (in)
+Returns: 0 in case of success
+The parameter is defined like this:
+        struct kvm_s390_ucas_mapping {
+                __u64 user_addr;
+                __u64 vcpu_addr;
+                __u64 length;
+        };
+This ioctl unmaps the memory in the vcpu's address space starting at
+"vcpu_addr" with the length "length". The field "user_addr" is ignored.
+All parameters need to be alligned by 1 megabyte.
+4.67 KVM_S390_VCPU_FAULT
+Capability: KVM_CAP_S390_UCONTROL
+Architectures: s390
+Type: vcpu ioctl
+Parameters: vcpu absolute address (in)
+Returns: 0 in case of success
+This call creates a page table entry on the virtual cpu's address space
+(for user controlled virtual machines) or the virtual machine's address
+space (for regular virtual machines). This only works for minor faults,
+thus it's recommended to access subject memory page via the user page
+table upfront. This is useful to handle validity intercepts for user
+controlled virtual machines to fault in the virtual cpu's lowcore pages
+prior to calling the KVM_RUN ioctl.
+4.68 KVM_SET_ONE_REG
+Capability: KVM_CAP_ONE_REG
+Architectures: all
+Type: vcpu ioctl
+Parameters: struct kvm_one_reg (in)
+Returns: 0 on success, negative value on failure
+struct kvm_one_reg {
+       __u64 id;
+       __u64 addr;
+};
+Using this ioctl, a single vcpu register can be set to a specific value
+defined by user space with the passed in struct kvm_one_reg, where id
+refers to the register identifier as described below and addr is a pointer
+to a variable with the respective size. There can be architecture agnostic
+and architecture specific registers. Each have their own range of operation
+and their own constants and width. To keep track of the implemented
+registers, find a list below:
+  Arch  |       Register        | Width (bits)
+        |                       |
+  PPC   | KVM_REG_PPC_HIOR      | 64
+4.69 KVM_GET_ONE_REG
+Capability: KVM_CAP_ONE_REG
+Architectures: all
+Type: vcpu ioctl
+Parameters: struct kvm_one_reg (in and out)
+Returns: 0 on success, negative value on failure
+This ioctl allows to receive the value of a single register implemented
+in a vcpu. The register to read is indicated by the "id" field of the
+kvm_one_reg struct passed in. On success, the register value can be found
+at the memory location pointed to by "addr".
+The list of registers accessible using this interface is identical to the
+list in 4.64.
 5. The kvm_run structure
 Application code obtains a pointer to the kvm_run structure by
@@ -1651,6 +1829,20 @@ s390 specific.
 s390 specific.
+                /* KVM_EXIT_S390_UCONTROL */
+                struct {
+                        __u64 trans_exc_code;
+                        __u32 pgm_code;
+                } s390_ucontrol;
+s390 specific. A page fault has occurred for a user controlled virtual
+machine (KVM_VM_S390_UNCONTROL) on it's host page table that cannot be
+resolved by the kernel.
+The program code and the translation exception code that were placed
+in the cpu's lowcore are presented here as defined by the z Architecture
+Principles of Operation Book in the Chapter for Dynamic Address Translation
+(DAT)
                /* KVM_EXIT_DCR */
                struct {
                        __u32 dcrn;
@@ -1693,6 +1885,29 @@ developer registration required to access it).
                /* Fix the size of the union. */
                char padding[256];
        };
+        /*
+         * shared registers between kvm and userspace.
+         * kvm_valid_regs specifies the register classes set by the host
+         * kvm_dirty_regs specified the register classes dirtied by userspace
+         * struct kvm_sync_regs is architecture specific, as well as the
+         * bits for kvm_valid_regs and kvm_dirty_regs
+         */
+        __u64 kvm_valid_regs;
+        __u64 kvm_dirty_regs;
+        union {
+                struct kvm_sync_regs regs;
+                char padding[1024];
+        } s;
+If KVM_CAP_SYNC_REGS is defined, these fields allow userspace to access
+certain guest registers without having to call SET/GET_*REGS. Thus we can
+avoid some system call overhead if userspace has to handle the exit.
+Userspace can query the validity of the structure by checking
+kvm_valid_regs for specific bits. These bits are architecture specific
+and usually define the validity of a groups of registers. (e.g. one bit
+ for general purpose registers)
 };
 6. Capabilities that can be enabled
@@ -1741,3 +1956,45 @@ HTAB address part of SDR1 contains an HVA instead of a GPA, as PAPR keeps the
 HTAB invisible to the guest.
 When this capability is enabled, KVM_EXIT_PAPR_HCALL can occur.
+6.3 KVM_CAP_SW_TLB
+Architectures: ppc
+Parameters: args[0] is the address of a struct kvm_config_tlb
+Returns: 0 on success; -1 on error
+struct kvm_config_tlb {
+        __u64 params;
+        __u64 array;
+        __u32 mmu_type;
+        __u32 array_len;
+};
+Configures the virtual CPU's TLB array, establishing a shared memory area
+between userspace and KVM.  The "params" and "array" fields are userspace
+addresses of mmu-type-specific data structures.  The "array_len" field is an
+safety mechanism, and should be set to the size in bytes of the memory that
+userspace has reserved for the array.  It must be at least the size dictated
+by "mmu_type" and "params".
+While KVM_RUN is active, the shared region is under control of KVM.  Its
+contents are undefined, and any modification by userspace results in
+boundedly undefined behavior.
+On return from KVM_RUN, the shared region will reflect the current state of
+the guest's TLB.  If userspace makes any changes, it must call KVM_DIRTY_TLB
+to tell KVM which entries have been changed, prior to calling KVM_RUN again
+on this vcpu.
+For mmu types KVM_MMU_FSL_BOOKE_NOHV and KVM_MMU_FSL_BOOKE_HV:
+ - The "params" field is of type "struct kvm_book3e_206_tlb_params".
+ - The "array" field points to an array of type "struct
+   kvm_book3e_206_tlb_entry".
+ - The array consists of all entries in the first TLB, followed by all
+   entries in the second TLB.
+ - Within a TLB, entries are ordered first by increasing set number.  Within a
+   set, entries are ordered by way (increasing ESEL).
+ - The hash for determining set number in TLB0 is: (MAS2 >> 12) & (num_sets - 1)
+   where "num_sets" is the tlb_sizes[] value divided by the tlb_ways[] value.
+ - The tsize field of mas1 shall be set to 4K on TLB0, even though the
+   hardware ignores this value for TLB0.
diff --git a/Documentation/virtual/kvm/ppc-pv.txt b/Documentation/virtual/kvm/ppc-pv.txt
index 2b7ce190cde4..6e7c37050930 100644
--- a/Documentation/virtual/kvm/ppc-pv.txt
+++ b/Documentation/virtual/kvm/ppc-pv.txt
@@ -81,28 +81,8 @@ additional registers to the magic page. If you add fields to the magic page,
 also define a new hypercall feature to indicate that the host can give you more
 registers. Only if the host supports the additional features, make use of them.
-The magic page has the following layout as described in
+The magic page layout is described by struct kvm_vcpu_arch_shared
-arch/powerpc/include/asm/kvm_para.h:
+in arch/powerpc/include/asm/kvm_para.h.
-struct kvm_vcpu_arch_shared {
-        __u64 scratch1;
-        __u64 scratch2;
-        __u64 scratch3;
-        __u64 critical;         /* Guest may not get interrupts if == r1 */
-        __u64 sprg0;
-        __u64 sprg1;
-        __u64 sprg2;
-        __u64 sprg3;
-        __u64 srr0;
-        __u64 srr1;
-        __u64 dar;
-        __u64 msr;
-        __u32 dsisr;
-        __u32 int_pending;      /* Tells the guest if we have an interrupt */
-};
-Additions to the page must only occur at the end. Struct fields are always 32
-or 64 bit aligned, depending on them being 32 or 64 bit wide respectively.
 Magic page features
 ===================
diff --git a/Documentation/vm/Makefile b/Documentation/vm/Makefile
deleted file mode 100644
index 3fa4d0668864..000000000000
--- a/Documentation/vm/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# kbuild trick to avoid linker error. Can be omitted if a module is built.
-obj- := dummy.o
-# List of programs to build
-hostprogs-y := page-types hugepage-mmap hugepage-shm map_hugetlb
-# Tell kbuild to always build the programs
-always := $(hostprogs-y)
diff --git a/Documentation/vm/cleancache.txt b/Documentation/vm/cleancache.txt
index d5c615af10ba..142fbb0f325a 100644
--- a/Documentation/vm/cleancache.txt
+++ b/Documentation/vm/cleancache.txt
@@ -46,10 +46,11 @@ a negative return value indicates failure.  A "put_page" will copy a
 the pool id, a file key, and a page index into the file.  (The combination
 of a pool id, a file key, and an index is sometimes called a "handle".)
 A "get_page" will copy the page, if found, from cleancache into kernel memory.
-A "flush_page" will ensure the page no longer is present in cleancache;
+An "invalidate_page" will ensure the page no longer is present in cleancache;
-a "flush_inode" will flush all pages associated with the specified file;
+an "invalidate_inode" will invalidate all pages associated with the specified
-and, when a filesystem is unmounted, a "flush_fs" will flush all pages in
+file; and, when a filesystem is unmounted, an "invalidate_fs" will invalidate
-all files specified by the given pool id and also surrender the pool id.
+all pages in all files specified by the given pool id and also surrender
+the pool id.
 An "init_shared_fs", like init_fs, obtains a pool id but tells cleancache
 to treat the pool as shared using a 128-bit UUID as a key.  On systems
@@ -62,12 +63,12 @@ of the kernel (e.g. by "tools" that control cleancache).  Or a
 cleancache implementation can simply disable shared_init by always
 returning a negative value.
-If a get_page is successful on a non-shared pool, the page is flushed (thus
+If a get_page is successful on a non-shared pool, the page is invalidated
-making cleancache an "exclusive" cache).  On a shared pool, the page
+(thus making cleancache an "exclusive" cache).  On a shared pool, the page
-is NOT flushed on a successful get_page so that it remains accessible to
+is NOT invalidated on a successful get_page so that it remains accessible to
 other sharers.  The kernel is responsible for ensuring coherency between
 cleancache (shared or not), the page cache, and the filesystem, using
-cleancache flush operations as required.
+cleancache invalidate operations as required.
 Note that cleancache must enforce put-put-get coherency and get-get
 coherency.  For the former, if two puts are made to the same handle but
@@ -77,20 +78,20 @@ if a get for a given handle fails, subsequent gets for that handle will
 never succeed unless preceded by a successful put with that handle.
 Last, cleancache provides no SMP serialization guarantees; if two
-different Linux threads are simultaneously putting and flushing a page
+different Linux threads are simultaneously putting and invalidating a page
 with the same handle, the results are indeterminate.  Callers must
 lock the page to ensure serial behavior.
 CLEANCACHE PERFORMANCE METRICS
-Cleancache monitoring is done by sysfs files in the
+If properly configured, monitoring of cleancache is done via debugfs in
-/sys/kernel/mm/cleancache directory.  The effectiveness of cleancache
+the /sys/kernel/debug/mm/cleancache directory.  The effectiveness of cleancache
 can be measured (across all filesystems) with:
 succ_gets       - number of gets that were successful
 failed_gets     - number of gets that failed
 puts            - number of puts attempted (all "succeed")
-flushes         - number of flushes attempted
+invalidates     - number of invalidates attempted
 A backend implementation may provide additional metrics.
@@ -143,7 +144,7 @@ systems.
 The core hooks for cleancache in VFS are in most cases a single line
 and the minimum set are placed precisely where needed to maintain
-coherency (via cleancache_flush operations) between cleancache,
+coherency (via cleancache_invalidate operations) between cleancache,
 the page cache, and disk.  All hooks compile into nothingness if
 cleancache is config'ed off and turn into a function-pointer-
 compare-to-NULL if config'ed on but no backend claims the ops
@@ -184,15 +185,15 @@ or for real kernel-addressable RAM, it makes perfect sense for
 transcendent memory.
 4) Why is non-shared cleancache "exclusive"?  And where is the
-   page "flushed" after a "get"? (Minchan Kim)
+   page "invalidated" after a "get"? (Minchan Kim)
 The main reason is to free up space in transcendent memory and
-to avoid unnecessary cleancache_flush calls.  If you want inclusive,
+to avoid unnecessary cleancache_invalidate calls.  If you want inclusive,
 the page can be "put" immediately following the "get".  If
 put-after-get for inclusive becomes common, the interface could
-be easily extended to add a "get_no_flush" call.
+be easily extended to add a "get_no_invalidate" call.
-The flush is done by the cleancache backend implementation.
+The invalidate is done by the cleancache backend implementation.
 5) What's the performance impact?
@@ -222,7 +223,7 @@ Some points for a filesystem to consider:
  as tmpfs should not enable cleancache)
 - To ensure coherency/correctness, the FS must ensure that all
  file removal or truncation operations either go through VFS or
-  add hooks to do the equivalent cleancache "flush" operations
+  add hooks to do the equivalent cleancache "invalidate" operations
 - To ensure coherency/correctness, either inode numbers must
  be unique across the lifetime of the on-disk file OR the
  FS must provide an "encode_fh" function.
@@ -243,11 +244,11 @@ If cleancache would use the inode virtual address instead of
 inode/filehandle, the pool id could be eliminated.  But, this
 won't work because cleancache retains pagecache data pages
 persistently even when the inode has been pruned from the
-inode unused list, and only flushes the data page if the file
+inode unused list, and only invalidates the data page if the file
 gets removed/truncated.  So if cleancache used the inode kva,
 there would be potential coherency issues if/when the inode
 kva is reused for a different file.  Alternately, if cleancache
-flushed the pages when the inode kva was freed, much of the value
+invalidated the pages when the inode kva was freed, much of the value
 of cleancache would be lost because the cache of pages in cleanache
 is potentially much larger than the kernel pagecache and is most
 useful if the pages survive inode cache removal.
diff --git a/Documentation/vm/hugepage-mmap.c b/Documentation/vm/hugepage-mmap.c
deleted file mode 100644
index db0dd9a33d54..000000000000
--- a/Documentation/vm/hugepage-mmap.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * hugepage-mmap:
- *
- * Example of using huge page memory in a user application using the mmap
- * system call.  Before running this application, make sure that the
- * administrator has mounted the hugetlbfs filesystem (on some directory
- * like /mnt) using the command mount -t hugetlbfs nodev /mnt. In this
- * example, the app is requesting memory of size 256MB that is backed by
- * huge pages.
- *
- * For the ia64 architecture, the Linux kernel reserves Region number 4 for
- * huge pages.  That means that if one requires a fixed address, a huge page
- * aligned address starting with 0x800000... will be required.  If a fixed
- * address is not required, the kernel will select an address in the proper
- * range.
- * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#define FILE_NAME "/mnt/hugepagefile"
-#define LENGTH (256UL*1024*1024)
-#define PROTECTION (PROT_READ | PROT_WRITE)
-/* Only ia64 requires this */
-#ifdef __ia64__
-#define ADDR (void *)(0x8000000000000000UL)
-#define FLAGS (MAP_SHARED | MAP_FIXED)
-#else
-#define ADDR (void *)(0x0UL)
-#define FLAGS (MAP_SHARED)
-#endif
-static void check_bytes(char *addr)
-{
-        printf("First hex is %x\n", *((unsigned int *)addr));
-}
-static void write_bytes(char *addr)
-{
-        unsigned long i;
-        for (i = 0; i < LENGTH; i++)
-                *(addr + i) = (char)i;
-}
-static void read_bytes(char *addr)
-{
-        unsigned long i;
-        check_bytes(addr);
-        for (i = 0; i < LENGTH; i++)
-                if (*(addr + i) != (char)i) {
-                        printf("Mismatch at %lu\n", i);
-                        break;
-                }
-}
-int main(void)
-{
-        void *addr;
-        int fd;
-        fd = open(FILE_NAME, O_CREAT | O_RDWR, 0755);
-        if (fd < 0) {
-                perror("Open failed");
-                exit(1);
-        }
-        addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, fd, 0);
-        if (addr == MAP_FAILED) {
-                perror("mmap");
-                unlink(FILE_NAME);
-                exit(1);
-        }
-        printf("Returned address is %p\n", addr);
-        check_bytes(addr);
-        write_bytes(addr);
-        read_bytes(addr);
-        munmap(addr, LENGTH);
-        close(fd);
-        unlink(FILE_NAME);
-        return 0;
-}
diff --git a/Documentation/vm/hugepage-shm.c b/Documentation/vm/hugepage-shm.c
deleted file mode 100644
index 07956d8592c9..000000000000
--- a/Documentation/vm/hugepage-shm.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * hugepage-shm:
- *
- * Example of using huge page memory in a user application using Sys V shared
- * memory system calls.  In this example the app is requesting 256MB of
- * memory that is backed by huge pages.  The application uses the flag
- * SHM_HUGETLB in the shmget system call to inform the kernel that it is
- * requesting huge pages.
- *
- * For the ia64 architecture, the Linux kernel reserves Region number 4 for
- * huge pages.  That means that if one requires a fixed address, a huge page
- * aligned address starting with 0x800000... will be required.  If a fixed
- * address is not required, the kernel will select an address in the proper
- * range.
- * Other architectures, such as ppc64, i386 or x86_64 are not so constrained.
- *
- * Note: The default shared memory limit is quite low on many kernels,
- * you may need to increase it via:
- *
- * echo 268435456 > /proc/sys/kernel/shmmax
- *
- * This will increase the maximum size per shared memory segment to 256MB.
- * The other limit that you will hit eventually is shmall which is the
- * total amount of shared memory in pages. To set it to 16GB on a system
- * with a 4kB pagesize do:
- *
- * echo 4194304 > /proc/sys/kernel/shmall
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/mman.h>
-#ifndef SHM_HUGETLB
-#define SHM_HUGETLB 04000
-#endif
-#define LENGTH (256UL*1024*1024)
-#define dprintf(x)  printf(x)
-/* Only ia64 requires this */
-#ifdef __ia64__
-#define ADDR (void *)(0x8000000000000000UL)
-#define SHMAT_FLAGS (SHM_RND)
-#else
-#define ADDR (void *)(0x0UL)
-#define SHMAT_FLAGS (0)
-#endif
-int main(void)
-{
-        int shmid;
-        unsigned long i;
-        char *shmaddr;
-        if ((shmid = shmget(2, LENGTH,
-                            SHM_HUGETLB | IPC_CREAT | SHM_R | SHM_W)) < 0) {
-                perror("shmget");
-                exit(1);
-        }
-        printf("shmid: 0x%x\n", shmid);
-        shmaddr = shmat(shmid, ADDR, SHMAT_FLAGS);
-        if (shmaddr == (char *)-1) {
-                perror("Shared memory attach failure");
-                shmctl(shmid, IPC_RMID, NULL);
-                exit(2);
-        }
-        printf("shmaddr: %p\n", shmaddr);
-        dprintf("Starting the writes:\n");
-        for (i = 0; i < LENGTH; i++) {
-                shmaddr[i] = (char)(i);
-                if (!(i % (1024 * 1024)))
-                        dprintf(".");
-        }
-        dprintf("\n");
-        dprintf("Starting the Check...");
-        for (i = 0; i < LENGTH; i++)
-                if (shmaddr[i] != (char)i)
-                        printf("\nIndex %lu mismatched\n", i);
-        dprintf("Done.\n");
-        if (shmdt((const void *)shmaddr) != 0) {
-                perror("Detach failure");
-                shmctl(shmid, IPC_RMID, NULL);
-                exit(3);
-        }
-        shmctl(shmid, IPC_RMID, NULL);
-        return 0;
-}
diff --git a/Documentation/vm/map_hugetlb.c b/Documentation/vm/map_hugetlb.c
deleted file mode 100644
index eda1a6d3578a..000000000000
--- a/Documentation/vm/map_hugetlb.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Example of using hugepage memory in a user application using the mmap
- * system call with MAP_HUGETLB flag.  Before running this program make
- * sure the administrator has allocated enough default sized huge pages
- * to cover the 256 MB allocation.
- *
- * For ia64 architecture, Linux kernel reserves Region number 4 for hugepages.
- * That means the addresses starting with 0x800000... will need to be
- * specified.  Specifying a fixed address is not required on ppc64, i386
- * or x86_64.
- */
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#define LENGTH (256UL*1024*1024)
-#define PROTECTION (PROT_READ | PROT_WRITE)
-#ifndef MAP_HUGETLB
-#define MAP_HUGETLB 0x40000 /* arch specific */
-#endif
-/* Only ia64 requires this */
-#ifdef __ia64__
-#define ADDR (void *)(0x8000000000000000UL)
-#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_FIXED)
-#else
-#define ADDR (void *)(0x0UL)
-#define FLAGS (MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB)
-#endif
-static void check_bytes(char *addr)
-{
-        printf("First hex is %x\n", *((unsigned int *)addr));
-}
-static void write_bytes(char *addr)
-{
-        unsigned long i;
-        for (i = 0; i < LENGTH; i++)
-                *(addr + i) = (char)i;
-}
-static void read_bytes(char *addr)
-{
-        unsigned long i;
-        check_bytes(addr);
-        for (i = 0; i < LENGTH; i++)
-                if (*(addr + i) != (char)i) {
-                        printf("Mismatch at %lu\n", i);
-                        break;
-                }
-}
-int main(void)
-{
-        void *addr;
-        addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, 0, 0);
-        if (addr == MAP_FAILED) {
-                perror("mmap");
-                exit(1);
-        }
-        printf("Returned address is %p\n", addr);
-        check_bytes(addr);
-        write_bytes(addr);
-        read_bytes(addr);
-        munmap(addr, LENGTH);
-        return 0;
-}
diff --git a/Documentation/vm/page-types.c b/Documentation/vm/page-types.c
deleted file mode 100644
index 0b13f02d4059..000000000000
--- a/Documentation/vm/page-types.c
+++ /dev/null
@@ -1,1102 +0,0 @@
-/*
- * page-types: Tool for querying page flags
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; version 2.
- *
- * 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.
- *
- * You should find a copy of v2 of the GNU General Public License somewhere on
- * your Linux system; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * Copyright (C) 2009 Intel corporation
- *
- * Authors: Wu Fengguang <fengguang.wu@intel.com>
- */
-#define _LARGEFILE64_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <string.h>
-#include <getopt.h>
-#include <limits.h>
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <sys/fcntl.h>
-#include <sys/mount.h>
-#include <sys/statfs.h>
-#include "../../include/linux/magic.h"
-#ifndef MAX_PATH
-# define MAX_PATH 256
-#endif
-#ifndef STR
-# define _STR(x) #x
-# define STR(x) _STR(x)
-#endif
-/*
- * pagemap kernel ABI bits
- */
-#define PM_ENTRY_BYTES      sizeof(uint64_t)
-#define PM_STATUS_BITS      3
-#define PM_STATUS_OFFSET    (64 - PM_STATUS_BITS)
-#define PM_STATUS_MASK      (((1LL << PM_STATUS_BITS) - 1) << PM_STATUS_OFFSET)
-#define PM_STATUS(nr)       (((nr) << PM_STATUS_OFFSET) & PM_STATUS_MASK)
-#define PM_PSHIFT_BITS      6
-#define PM_PSHIFT_OFFSET    (PM_STATUS_OFFSET - PM_PSHIFT_BITS)
-#define PM_PSHIFT_MASK      (((1LL << PM_PSHIFT_BITS) - 1) << PM_PSHIFT_OFFSET)
-#define PM_PSHIFT(x)        (((u64) (x) << PM_PSHIFT_OFFSET) & PM_PSHIFT_MASK)
-#define PM_PFRAME_MASK      ((1LL << PM_PSHIFT_OFFSET) - 1)
-#define PM_PFRAME(x)        ((x) & PM_PFRAME_MASK)
-#define PM_PRESENT          PM_STATUS(4LL)
-#define PM_SWAP             PM_STATUS(2LL)
-/*
- * kernel page flags
- */
-#define KPF_BYTES               8
-#define PROC_KPAGEFLAGS         "/proc/kpageflags"
-/* copied from kpageflags_read() */
-#define KPF_LOCKED              0
-#define KPF_ERROR               1
-#define KPF_REFERENCED          2
-#define KPF_UPTODATE            3
-#define KPF_DIRTY               4
-#define KPF_LRU                 5
-#define KPF_ACTIVE              6
-#define KPF_SLAB                7
-#define KPF_WRITEBACK           8
-#define KPF_RECLAIM             9
-#define KPF_BUDDY               10
-/* [11-20] new additions in 2.6.31 */
-#define KPF_MMAP                11
-#define KPF_ANON                12
-#define KPF_SWAPCACHE           13
-#define KPF_SWAPBACKED          14
-#define KPF_COMPOUND_HEAD       15
-#define KPF_COMPOUND_TAIL       16
-#define KPF_HUGE                17
-#define KPF_UNEVICTABLE         18
-#define KPF_HWPOISON            19
-#define KPF_NOPAGE              20
-#define KPF_KSM                 21
-#define KPF_THP                 22
-/* [32-] kernel hacking assistances */
-#define KPF_RESERVED            32
-#define KPF_MLOCKED             33
-#define KPF_MAPPEDTODISK        34
-#define KPF_PRIVATE             35
-#define KPF_PRIVATE_2           36
-#define KPF_OWNER_PRIVATE       37
-#define KPF_ARCH                38
-#define KPF_UNCACHED            39
-/* [48-] take some arbitrary free slots for expanding overloaded flags
- * not part of kernel API
- */
-#define KPF_READAHEAD           48
-#define KPF_SLOB_FREE           49
-#define KPF_SLUB_FROZEN         50
-#define KPF_SLUB_DEBUG          51
-#define KPF_ALL_BITS            ((uint64_t)~0ULL)
-#define KPF_HACKERS_BITS        (0xffffULL << 32)
-#define KPF_OVERLOADED_BITS     (0xffffULL << 48)
-#define BIT(name)               (1ULL << KPF_##name)
-#define BITS_COMPOUND           (BIT(COMPOUND_HEAD) | BIT(COMPOUND_TAIL))
-static const char *page_flag_names[] = {
-        [KPF_LOCKED]            = "L:locked",
-        [KPF_ERROR]             = "E:error",
-        [KPF_REFERENCED]        = "R:referenced",
-        [KPF_UPTODATE]          = "U:uptodate",
-        [KPF_DIRTY]             = "D:dirty",
-        [KPF_LRU]               = "l:lru",
-        [KPF_ACTIVE]            = "A:active",
-        [KPF_SLAB]              = "S:slab",
-        [KPF_WRITEBACK]         = "W:writeback",
-        [KPF_RECLAIM]           = "I:reclaim",
-        [KPF_BUDDY]             = "B:buddy",
-        [KPF_MMAP]              = "M:mmap",
-        [KPF_ANON]              = "a:anonymous",
-        [KPF_SWAPCACHE]         = "s:swapcache",
-        [KPF_SWAPBACKED]        = "b:swapbacked",
-        [KPF_COMPOUND_HEAD]     = "H:compound_head",
-        [KPF_COMPOUND_TAIL]     = "T:compound_tail",
-        [KPF_HUGE]              = "G:huge",
-        [KPF_UNEVICTABLE]       = "u:unevictable",
-        [KPF_HWPOISON]          = "X:hwpoison",
-        [KPF_NOPAGE]            = "n:nopage",
-        [KPF_KSM]               = "x:ksm",
-        [KPF_THP]               = "t:thp",
-        [KPF_RESERVED]          = "r:reserved",
-        [KPF_MLOCKED]           = "m:mlocked",
-        [KPF_MAPPEDTODISK]      = "d:mappedtodisk",
-        [KPF_PRIVATE]           = "P:private",
-        [KPF_PRIVATE_2]         = "p:private_2",
-        [KPF_OWNER_PRIVATE]     = "O:owner_private",
-        [KPF_ARCH]              = "h:arch",
-        [KPF_UNCACHED]          = "c:uncached",
-        [KPF_READAHEAD]         = "I:readahead",
-        [KPF_SLOB_FREE]         = "P:slob_free",
-        [KPF_SLUB_FROZEN]       = "A:slub_frozen",
-        [KPF_SLUB_DEBUG]        = "E:slub_debug",
-};
-static const char *debugfs_known_mountpoints[] = {
-        "/sys/kernel/debug",
-        "/debug",
-        0,
-};
-/*
- * data structures
- */
-static int              opt_raw;        /* for kernel developers */
-static int              opt_list;       /* list pages (in ranges) */
-static int              opt_no_summary; /* don't show summary */
-static pid_t            opt_pid;        /* process to walk */
-#define MAX_ADDR_RANGES 1024
-static int              nr_addr_ranges;
-static unsigned long    opt_offset[MAX_ADDR_RANGES];
-static unsigned long    opt_size[MAX_ADDR_RANGES];
-#define MAX_VMAS        10240
-static int              nr_vmas;
-static unsigned long    pg_start[MAX_VMAS];
-static unsigned long    pg_end[MAX_VMAS];
-#define MAX_BIT_FILTERS 64
-static int              nr_bit_filters;
-static uint64_t         opt_mask[MAX_BIT_FILTERS];
-static uint64_t         opt_bits[MAX_BIT_FILTERS];
-static int              page_size;
-static int              pagemap_fd;
-static int              kpageflags_fd;
-static int              opt_hwpoison;
-static int              opt_unpoison;
-static char             hwpoison_debug_fs[MAX_PATH+1];
-static int              hwpoison_inject_fd;
-static int              hwpoison_forget_fd;
-#define HASH_SHIFT      13
-#define HASH_SIZE       (1 << HASH_SHIFT)
-#define HASH_MASK       (HASH_SIZE - 1)
-#define HASH_KEY(flags) (flags & HASH_MASK)
-static unsigned long    total_pages;
-static unsigned long    nr_pages[HASH_SIZE];
-static uint64_t         page_flags[HASH_SIZE];
-/*
- * helper functions
- */
-#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-#define min_t(type, x, y) ({                    \
-        type __min1 = (x);                      \
-        type __min2 = (y);                      \
-        __min1 < __min2 ? __min1 : __min2; })
-#define max_t(type, x, y) ({                    \
-        type __max1 = (x);                      \
-        type __max2 = (y);                      \
-        __max1 > __max2 ? __max1 : __max2; })
-static unsigned long pages2mb(unsigned long pages)
-{
-        return (pages * page_size) >> 20;
-}
-static void fatal(const char *x, ...)
-{
-        va_list ap;
-        va_start(ap, x);
-        vfprintf(stderr, x, ap);
-        va_end(ap);
-        exit(EXIT_FAILURE);
-}
-static int checked_open(const char *pathname, int flags)
-{
-        int fd = open(pathname, flags);
-        if (fd < 0) {
-                perror(pathname);
-                exit(EXIT_FAILURE);
-        }
-        return fd;
-}
-/*
- * pagemap/kpageflags routines
- */
-static unsigned long do_u64_read(int fd, char *name,
-                                 uint64_t *buf,
-                                 unsigned long index,
-                                 unsigned long count)
-{
-        long bytes;
-        if (index > ULONG_MAX / 8)
-                fatal("index overflow: %lu\n", index);
-        if (lseek(fd, index * 8, SEEK_SET) < 0) {
-                perror(name);
-                exit(EXIT_FAILURE);
-        }
-        bytes = read(fd, buf, count * 8);
-        if (bytes < 0) {
-                perror(name);
-                exit(EXIT_FAILURE);
-        }
-        if (bytes % 8)
-                fatal("partial read: %lu bytes\n", bytes);
-        return bytes / 8;
-}
-static unsigned long kpageflags_read(uint64_t *buf,
-                                     unsigned long index,
-                                     unsigned long pages)
-{
-        return do_u64_read(kpageflags_fd, PROC_KPAGEFLAGS, buf, index, pages);
-}
-static unsigned long pagemap_read(uint64_t *buf,
-                                  unsigned long index,
-                                  unsigned long pages)
-{
-        return do_u64_read(pagemap_fd, "/proc/pid/pagemap", buf, index, pages);
-}
-static unsigned long pagemap_pfn(uint64_t val)
-{
-        unsigned long pfn;
-        if (val & PM_PRESENT)
-                pfn = PM_PFRAME(val);
-        else
-                pfn = 0;
-        return pfn;
-}
-/*
- * page flag names
- */
-static char *page_flag_name(uint64_t flags)
-{
-        static char buf[65];
-        int present;
-        int i, j;
-        for (i = 0, j = 0; i < ARRAY_SIZE(page_flag_names); i++) {
-                present = (flags >> i) & 1;
-                if (!page_flag_names[i]) {
-                        if (present)
-                                fatal("unknown flag bit %d\n", i);
-                        continue;
-                }
-                buf[j++] = present ? page_flag_names[i][0] : '_';
-        }
-        return buf;
-}
-static char *page_flag_longname(uint64_t flags)
-{
-        static char buf[1024];
-        int i, n;
-        for (i = 0, n = 0; i < ARRAY_SIZE(page_flag_names); i++) {
-                if (!page_flag_names[i])
-                        continue;
-                if ((flags >> i) & 1)
-                        n += snprintf(buf + n, sizeof(buf) - n, "%s,",
-                                        page_flag_names[i] + 2);
-        }
-        if (n)
-                n--;
-        buf[n] = '\0';
-        return buf;
-}
-/*
- * page list and summary
- */
-static void show_page_range(unsigned long voffset,
-                            unsigned long offset, uint64_t flags)
-{
-        static uint64_t      flags0;
-        static unsigned long voff;
-        static unsigned long index;
-        static unsigned long count;
-        if (flags == flags0 && offset == index + count &&
-            (!opt_pid || voffset == voff + count)) {
-                count++;
-                return;
-        }
-        if (count) {
-                if (opt_pid)
-                        printf("%lx\t", voff);
-                printf("%lx\t%lx\t%s\n",
-                                index, count, page_flag_name(flags0));
-        }
-        flags0 = flags;
-        index  = offset;
-        voff   = voffset;
-        count  = 1;
-}
-static void show_page(unsigned long voffset,
-                      unsigned long offset, uint64_t flags)
-{
-        if (opt_pid)
-                printf("%lx\t", voffset);
-        printf("%lx\t%s\n", offset, page_flag_name(flags));
-}
-static void show_summary(void)
-{
-        int i;
-        printf("             flags\tpage-count       MB"
-                "  symbolic-flags\t\t\tlong-symbolic-flags\n");
-        for (i = 0; i < ARRAY_SIZE(nr_pages); i++) {
-                if (nr_pages[i])
-                        printf("0x%016llx\t%10lu %8lu  %s\t%s\n",
-                                (unsigned long long)page_flags[i],
-                                nr_pages[i],
-                                pages2mb(nr_pages[i]),
-                                page_flag_name(page_flags[i]),
-                                page_flag_longname(page_flags[i]));
-        }
-        printf("             total\t%10lu %8lu\n",
-                        total_pages, pages2mb(total_pages));
-}
-/*
- * page flag filters
- */
-static int bit_mask_ok(uint64_t flags)
-{
-        int i;
-        for (i = 0; i < nr_bit_filters; i++) {
-                if (opt_bits[i] == KPF_ALL_BITS) {
-                        if ((flags & opt_mask[i]) == 0)
-                                return 0;
-                } else {
-                        if ((flags & opt_mask[i]) != opt_bits[i])
-                                return 0;
-                }
-        }
-        return 1;
-}
-static uint64_t expand_overloaded_flags(uint64_t flags)
-{
-        /* SLOB/SLUB overload several page flags */
-        if (flags & BIT(SLAB)) {
-                if (flags & BIT(PRIVATE))
-                        flags ^= BIT(PRIVATE) | BIT(SLOB_FREE);
-                if (flags & BIT(ACTIVE))
-                        flags ^= BIT(ACTIVE) | BIT(SLUB_FROZEN);
-                if (flags & BIT(ERROR))
-                        flags ^= BIT(ERROR) | BIT(SLUB_DEBUG);
-        }
-        /* PG_reclaim is overloaded as PG_readahead in the read path */
-        if ((flags & (BIT(RECLAIM) | BIT(WRITEBACK))) == BIT(RECLAIM))
-                flags ^= BIT(RECLAIM) | BIT(READAHEAD);
-        return flags;
-}
-static uint64_t well_known_flags(uint64_t flags)
-{
-        /* hide flags intended only for kernel hacker */
-        flags &= ~KPF_HACKERS_BITS;
-        /* hide non-hugeTLB compound pages */
-        if ((flags & BITS_COMPOUND) && !(flags & BIT(HUGE)))
-                flags &= ~BITS_COMPOUND;
-        return flags;
-}
-static uint64_t kpageflags_flags(uint64_t flags)
-{
-        flags = expand_overloaded_flags(flags);
-        if (!opt_raw)
-                flags = well_known_flags(flags);
-        return flags;
-}
-/* verify that a mountpoint is actually a debugfs instance */
-static int debugfs_valid_mountpoint(const char *debugfs)
-{
-        struct statfs st_fs;
-        if (statfs(debugfs, &st_fs) < 0)
-                return -ENOENT;
-        else if (st_fs.f_type != (long) DEBUGFS_MAGIC)
-                return -ENOENT;
-        return 0;
-}
-/* find the path to the mounted debugfs */
-static const char *debugfs_find_mountpoint(void)
-{
-        const char **ptr;
-        char type[100];
-        FILE *fp;
-        ptr = debugfs_known_mountpoints;
-        while (*ptr) {
-                if (debugfs_valid_mountpoint(*ptr) == 0) {
-                        strcpy(hwpoison_debug_fs, *ptr);
-                        return hwpoison_debug_fs;
-                }
-                ptr++;
-        }
-        /* give up and parse /proc/mounts */
-        fp = fopen("/proc/mounts", "r");
-        if (fp == NULL)
-                perror("Can't open /proc/mounts for read");
-        while (fscanf(fp, "%*s %"
-                      STR(MAX_PATH)
-                      "s %99s %*s %*d %*d\n",
-                      hwpoison_debug_fs, type) == 2) {
-                if (strcmp(type, "debugfs") == 0)
-                        break;
-        }
-        fclose(fp);
-        if (strcmp(type, "debugfs") != 0)
-                return NULL;
-        return hwpoison_debug_fs;
-}
-/* mount the debugfs somewhere if it's not mounted */
-static void debugfs_mount(void)
-{
-        const char **ptr;
-        /* see if it's already mounted */
-        if (debugfs_find_mountpoint())
-                return;
-        ptr = debugfs_known_mountpoints;
-        while (*ptr) {
-                if (mount(NULL, *ptr, "debugfs", 0, NULL) == 0) {
-                        /* save the mountpoint */
-                        strcpy(hwpoison_debug_fs, *ptr);
-                        break;
-                }
-                ptr++;
-        }
-        if (*ptr == NULL) {
-                perror("mount debugfs");
-                exit(EXIT_FAILURE);
-        }
-}
-/*
- * page actions
- */
-static void prepare_hwpoison_fd(void)
-{
-        char buf[MAX_PATH + 1];
-        debugfs_mount();
-        if (opt_hwpoison && !hwpoison_inject_fd) {
-                snprintf(buf, MAX_PATH, "%s/hwpoison/corrupt-pfn",
-                        hwpoison_debug_fs);
-                hwpoison_inject_fd = checked_open(buf, O_WRONLY);
-        }
-        if (opt_unpoison && !hwpoison_forget_fd) {
-                snprintf(buf, MAX_PATH, "%s/hwpoison/unpoison-pfn",
-                        hwpoison_debug_fs);
-                hwpoison_forget_fd = checked_open(buf, O_WRONLY);
-        }
-}
-static int hwpoison_page(unsigned long offset)
-{
-        char buf[100];
-        int len;
-        len = sprintf(buf, "0x%lx\n", offset);
-        len = write(hwpoison_inject_fd, buf, len);
-        if (len < 0) {
-                perror("hwpoison inject");
-                return len;
-        }
-        return 0;
-}
-static int unpoison_page(unsigned long offset)
-{
-        char buf[100];
-        int len;
-        len = sprintf(buf, "0x%lx\n", offset);
-        len = write(hwpoison_forget_fd, buf, len);
-        if (len < 0) {
-                perror("hwpoison forget");
-                return len;
-        }
-        return 0;
-}
-/*
- * page frame walker
- */
-static int hash_slot(uint64_t flags)
-{
-        int k = HASH_KEY(flags);
-        int i;
-        /* Explicitly reserve slot 0 for flags 0: the following logic
-         * cannot distinguish an unoccupied slot from slot (flags==0).
-         */
-        if (flags == 0)
-                return 0;
-        /* search through the remaining (HASH_SIZE-1) slots */
-        for (i = 1; i < ARRAY_SIZE(page_flags); i++, k++) {
-                if (!k || k >= ARRAY_SIZE(page_flags))
-                        k = 1;
-                if (page_flags[k] == 0) {
-                        page_flags[k] = flags;
-                        return k;
-                }
-                if (page_flags[k] == flags)
-                        return k;
-        }
-        fatal("hash table full: bump up HASH_SHIFT?\n");
-        exit(EXIT_FAILURE);
-}
-static void add_page(unsigned long voffset,
-                     unsigned long offset, uint64_t flags)
-{
-        flags = kpageflags_flags(flags);
-        if (!bit_mask_ok(flags))
-                return;
-        if (opt_hwpoison)
-                hwpoison_page(offset);
-        if (opt_unpoison)
-                unpoison_page(offset);
-        if (opt_list == 1)
-                show_page_range(voffset, offset, flags);
-        else if (opt_list == 2)
-                show_page(voffset, offset, flags);
-        nr_pages[hash_slot(flags)]++;
-        total_pages++;
-}
-#define KPAGEFLAGS_BATCH        (64 << 10)      /* 64k pages */
-static void walk_pfn(unsigned long voffset,
-                     unsigned long index,
-                     unsigned long count)
-{
-        uint64_t buf[KPAGEFLAGS_BATCH];
-        unsigned long batch;
-        long pages;
-        unsigned long i;
-        while (count) {
-                batch = min_t(unsigned long, count, KPAGEFLAGS_BATCH);
-                pages = kpageflags_read(buf, index, batch);
-                if (pages == 0)
-                        break;
-                for (i = 0; i < pages; i++)
-                        add_page(voffset + i, index + i, buf[i]);
-                index += pages;
-                count -= pages;
-        }
-}
-#define PAGEMAP_BATCH   (64 << 10)
-static void walk_vma(unsigned long index, unsigned long count)
-{
-        uint64_t buf[PAGEMAP_BATCH];
-        unsigned long batch;
-        unsigned long pages;
-        unsigned long pfn;
-        unsigned long i;
-        while (count) {
-                batch = min_t(unsigned long, count, PAGEMAP_BATCH);
-                pages = pagemap_read(buf, index, batch);
-                if (pages == 0)
-                        break;
-                for (i = 0; i < pages; i++) {
-                        pfn = pagemap_pfn(buf[i]);
-                        if (pfn)
-                                walk_pfn(index + i, pfn, 1);
-                }
-                index += pages;
-                count -= pages;
-        }
-}
-static void walk_task(unsigned long index, unsigned long count)
-{
-        const unsigned long end = index + count;
-        unsigned long start;
-        int i = 0;
-        while (index < end) {
-                while (pg_end[i] <= index)
-                        if (++i >= nr_vmas)
-                                return;
-                if (pg_start[i] >= end)
-                        return;
-                start = max_t(unsigned long, pg_start[i], index);
-                index = min_t(unsigned long, pg_end[i], end);
-                assert(start < index);
-                walk_vma(start, index - start);
-        }
-}
-static void add_addr_range(unsigned long offset, unsigned long size)
-{
-        if (nr_addr_ranges >= MAX_ADDR_RANGES)
-                fatal("too many addr ranges\n");
-        opt_offset[nr_addr_ranges] = offset;
-        opt_size[nr_addr_ranges] = min_t(unsigned long, size, ULONG_MAX-offset);
-        nr_addr_ranges++;
-}
-static void walk_addr_ranges(void)
-{
-        int i;
-        kpageflags_fd = checked_open(PROC_KPAGEFLAGS, O_RDONLY);
-        if (!nr_addr_ranges)
-                add_addr_range(0, ULONG_MAX);
-        for (i = 0; i < nr_addr_ranges; i++)
-                if (!opt_pid)
-                        walk_pfn(0, opt_offset[i], opt_size[i]);
-                else
-                        walk_task(opt_offset[i], opt_size[i]);
-        close(kpageflags_fd);
-}
-/*
- * user interface
- */
-static const char *page_flag_type(uint64_t flag)
-{
-        if (flag & KPF_HACKERS_BITS)
-                return "(r)";
-        if (flag & KPF_OVERLOADED_BITS)
-                return "(o)";
-        return "   ";
-}
-static void usage(void)
-{
-        int i, j;
-        printf(
-"page-types [options]\n"
-"            -r|--raw                   Raw mode, for kernel developers\n"
-"            -d|--describe flags        Describe flags\n"
-"            -a|--addr    addr-spec     Walk a range of pages\n"
-"            -b|--bits    bits-spec     Walk pages with specified bits\n"
-"            -p|--pid     pid           Walk process address space\n"
-#if 0 /* planned features */
-"            -f|--file    filename      Walk file address space\n"
-#endif
-"            -l|--list                  Show page details in ranges\n"
-"            -L|--list-each             Show page details one by one\n"
-"            -N|--no-summary            Don't show summary info\n"
-"            -X|--hwpoison              hwpoison pages\n"
-"            -x|--unpoison              unpoison pages\n"
-"            -h|--help                  Show this usage message\n"
-"flags:\n"
-"            0x10                       bitfield format, e.g.\n"
-"            anon                       bit-name, e.g.\n"
-"            0x10,anon                  comma-separated list, e.g.\n"
-"addr-spec:\n"
-"            N                          one page at offset N (unit: pages)\n"
-"            N+M                        pages range from N to N+M-1\n"
-"            N,M                        pages range from N to M-1\n"
-"            N,                         pages range from N to end\n"
-"            ,M                         pages range from 0 to M-1\n"
-"bits-spec:\n"
-"            bit1,bit2                  (flags & (bit1|bit2)) != 0\n"
-"            bit1,bit2=bit1             (flags & (bit1|bit2)) == bit1\n"
-"            bit1,~bit2                 (flags & (bit1|bit2)) == bit1\n"
-"            =bit1,bit2                 flags == (bit1|bit2)\n"
-"bit-names:\n"
-        );
-        for (i = 0, j = 0; i < ARRAY_SIZE(page_flag_names); i++) {
-                if (!page_flag_names[i])
-                        continue;
-                printf("%16s%s", page_flag_names[i] + 2,
-                                 page_flag_type(1ULL << i));
-                if (++j > 3) {
-                        j = 0;
-                        putchar('\n');
-                }
-        }
-        printf("\n                                   "
-                "(r) raw mode bits  (o) overloaded bits\n");
-}
-static unsigned long long parse_number(const char *str)
-{
-        unsigned long long n;
-        n = strtoll(str, NULL, 0);
-        if (n == 0 && str[0] != '0')
-                fatal("invalid name or number: %s\n", str);
-        return n;
-}
-static void parse_pid(const char *str)
-{
-        FILE *file;
-        char buf[5000];
-        opt_pid = parse_number(str);
-        sprintf(buf, "/proc/%d/pagemap", opt_pid);
-        pagemap_fd = checked_open(buf, O_RDONLY);
-        sprintf(buf, "/proc/%d/maps", opt_pid);
-        file = fopen(buf, "r");
-        if (!file) {
-                perror(buf);
-                exit(EXIT_FAILURE);
-        }
-        while (fgets(buf, sizeof(buf), file) != NULL) {
-                unsigned long vm_start;
-                unsigned long vm_end;
-                unsigned long long pgoff;
-                int major, minor;
-                char r, w, x, s;
-                unsigned long ino;
-                int n;
-                n = sscanf(buf, "%lx-%lx %c%c%c%c %llx %x:%x %lu",
-                           &vm_start,
-                           &vm_end,
-                           &r, &w, &x, &s,
-                           &pgoff,
-                           &major, &minor,
-                           &ino);
-                if (n < 10) {
-                        fprintf(stderr, "unexpected line: %s\n", buf);
-                        continue;
-                }
-                pg_start[nr_vmas] = vm_start / page_size;
-                pg_end[nr_vmas] = vm_end / page_size;
-                if (++nr_vmas >= MAX_VMAS) {
-                        fprintf(stderr, "too many VMAs\n");
-                        break;
-                }
-        }
-        fclose(file);
-}
-static void parse_file(const char *name)
-{
-}
-static void parse_addr_range(const char *optarg)
-{
-        unsigned long offset;
-        unsigned long size;
-        char *p;
-        p = strchr(optarg, ',');
-        if (!p)
-                p = strchr(optarg, '+');
-        if (p == optarg) {
-                offset = 0;
-                size   = parse_number(p + 1);
-        } else if (p) {
-                offset = parse_number(optarg);
-                if (p[1] == '\0')
-                        size = ULONG_MAX;
-                else {
-                        size = parse_number(p + 1);
-                        if (*p == ',') {
-                                if (size < offset)
-                                        fatal("invalid range: %lu,%lu\n",
-                                                        offset, size);
-                                size -= offset;
-                        }
-                }
-        } else {
-                offset = parse_number(optarg);
-                size   = 1;
-        }
-        add_addr_range(offset, size);
-}
-static void add_bits_filter(uint64_t mask, uint64_t bits)
-{
-        if (nr_bit_filters >= MAX_BIT_FILTERS)
-                fatal("too much bit filters\n");
-        opt_mask[nr_bit_filters] = mask;
-        opt_bits[nr_bit_filters] = bits;
-        nr_bit_filters++;
-}
-static uint64_t parse_flag_name(const char *str, int len)
-{
-        int i;
-        if (!*str || !len)
-                return 0;
-        if (len <= 8 && !strncmp(str, "compound", len))
-                return BITS_COMPOUND;
-        for (i = 0; i < ARRAY_SIZE(page_flag_names); i++) {
-                if (!page_flag_names[i])
-                        continue;
-                if (!strncmp(str, page_flag_names[i] + 2, len))
-                        return 1ULL << i;
-        }
-        return parse_number(str);
-}
-static uint64_t parse_flag_names(const char *str, int all)
-{
-        const char *p    = str;
-        uint64_t   flags = 0;
-        while (1) {
-                if (*p == ',' || *p == '=' || *p == '\0') {
-                        if ((*str != '~') || (*str == '~' && all && *++str))
-                                flags |= parse_flag_name(str, p - str);
-                        if (*p != ',')
-                                break;
-                        str = p + 1;
-                }
-                p++;
-        }
-        return flags;
-}
-static void parse_bits_mask(const char *optarg)
-{
-        uint64_t mask;
-        uint64_t bits;
-        const char *p;
-        p = strchr(optarg, '=');
-        if (p == optarg) {
-                mask = KPF_ALL_BITS;
-                bits = parse_flag_names(p + 1, 0);
-        } else if (p) {
-                mask = parse_flag_names(optarg, 0);
-                bits = parse_flag_names(p + 1, 0);
-        } else if (strchr(optarg, '~')) {
-                mask = parse_flag_names(optarg, 1);
-                bits = parse_flag_names(optarg, 0);
-        } else {
-                mask = parse_flag_names(optarg, 0);
-                bits = KPF_ALL_BITS;
-        }
-        add_bits_filter(mask, bits);
-}
-static void describe_flags(const char *optarg)
-{
-        uint64_t flags = parse_flag_names(optarg, 0);
-        printf("0x%016llx\t%s\t%s\n",
-                (unsigned long long)flags,
-                page_flag_name(flags),
-                page_flag_longname(flags));
-}
-static const struct option opts[] = {
-        { "raw"       , 0, NULL, 'r' },
-        { "pid"       , 1, NULL, 'p' },
-        { "file"      , 1, NULL, 'f' },
-        { "addr"      , 1, NULL, 'a' },
-        { "bits"      , 1, NULL, 'b' },
-        { "describe"  , 1, NULL, 'd' },
-        { "list"      , 0, NULL, 'l' },
-        { "list-each" , 0, NULL, 'L' },
-        { "no-summary", 0, NULL, 'N' },
-        { "hwpoison"  , 0, NULL, 'X' },
-        { "unpoison"  , 0, NULL, 'x' },
-        { "help"      , 0, NULL, 'h' },
-        { NULL        , 0, NULL, 0 }
-};
-int main(int argc, char *argv[])
-{
-        int c;
-        page_size = getpagesize();
-        while ((c = getopt_long(argc, argv,
-                                "rp:f:a:b:d:lLNXxh", opts, NULL)) != -1) {
-                switch (c) {
-                case 'r':
-                        opt_raw = 1;
-                        break;
-                case 'p':
-                        parse_pid(optarg);
-                        break;
-                case 'f':
-                        parse_file(optarg);
-                        break;
-                case 'a':
-                        parse_addr_range(optarg);
-                        break;
-                case 'b':
-                        parse_bits_mask(optarg);
-                        break;
-                case 'd':
-                        describe_flags(optarg);
-                        exit(0);
-                case 'l':
-                        opt_list = 1;
-                        break;
-                case 'L':
-                        opt_list = 2;
-                        break;
-                case 'N':
-                        opt_no_summary = 1;
-                        break;
-                case 'X':
-                        opt_hwpoison = 1;
-                        prepare_hwpoison_fd();
-                        break;
-                case 'x':
-                        opt_unpoison = 1;
-                        prepare_hwpoison_fd();
-                        break;
-                case 'h':
-                        usage();
-                        exit(0);
-                default:
-                        usage();
-                        exit(1);
-                }
-        }
-        if (opt_list && opt_pid)
-                printf("voffset\t");
-        if (opt_list == 1)
-                printf("offset\tlen\tflags\n");
-        if (opt_list == 2)
-                printf("offset\tflags\n");
-        walk_addr_ranges();
-        if (opt_list == 1)
-                show_page_range(0, 0, 0);  /* drain the buffer */
-        if (opt_no_summary)
-                return 0;
-        if (opt_list)
-                printf("\n\n");
-        show_summary();
-        return 0;
-}
diff --git a/Documentation/watchdog/00-INDEX b/Documentation/watchdog/00-INDEX
deleted file mode 100644
index fc9082a1477a..000000000000
--- a/Documentation/watchdog/00-INDEX
+++ /dev/null
@@ -1,19 +0,0 @@
-00-INDEX
-        - this file.
-convert_drivers_to_kernel_api.txt
-        - how-to for converting old watchdog drivers to the new kernel API.
-hpwdt.txt
-        - information on the HP iLO2 NMI watchdog
-pcwd-watchdog.txt
-        - documentation for Berkshire Products PC Watchdog ISA cards.
-src/
-        - directory holding watchdog related example programs.
-watchdog-api.txt
-        - description of the Linux Watchdog driver API.
-watchdog-kernel-api.txt
-        - description of the Linux WatchDog Timer Driver Core kernel API.
-watchdog-parameters.txt
-        - information on driver parameters (for drivers other than
-          the ones that have driver-specific files here)
-wdt.txt
-        - description of the Watchdog Timer Interfaces for Linux.
diff --git a/Documentation/watchdog/convert_drivers_to_kernel_api.txt b/Documentation/watchdog/convert_drivers_to_kernel_api.txt
index be8119bb15d2..271b8850dde7 100644
--- a/Documentation/watchdog/convert_drivers_to_kernel_api.txt
+++ b/Documentation/watchdog/convert_drivers_to_kernel_api.txt
@@ -59,6 +59,10 @@ Here is a overview of the functions and probably needed actions:
        WDIOC_GETTIMEOUT:
                No preparations needed
+        WDIOC_GETTIMELEFT:
+                It needs get_timeleft() callback to be defined. Otherwise it
+                will return EOPNOTSUPP
  Other IOCTLs can be served using the ioctl-callback. Note that this is mainly
  intended for porting old drivers; new drivers should not invent private IOCTLs.
  Private IOCTLs are processed first. When the callback returns with
diff --git a/Documentation/watchdog/watchdog-kernel-api.txt b/Documentation/watchdog/watchdog-kernel-api.txt
index 9e162465b0cf..227f6cd0e5fa 100644
--- a/Documentation/watchdog/watchdog-kernel-api.txt
+++ b/Documentation/watchdog/watchdog-kernel-api.txt
@@ -1,6 +1,6 @@
 The Linux WatchDog Timer Driver Core kernel API.
 ===============================================
-Last reviewed: 29-Nov-2011
+Last reviewed: 16-Mar-2012
 Wim Van Sebroeck <wim@iguana.be>
@@ -77,6 +77,7 @@ struct watchdog_ops {
        int (*ping)(struct watchdog_device *);
        unsigned int (*status)(struct watchdog_device *);
        int (*set_timeout)(struct watchdog_device *, unsigned int);
+        unsigned int (*get_timeleft)(struct watchdog_device *);
        long (*ioctl)(struct watchdog_device *, unsigned int, unsigned long);
 };
@@ -117,11 +118,13 @@ they are supported. These optional routines/operations are:
  status of the device is reported with watchdog WDIOF_* status flags/bits.
 * set_timeout: this routine checks and changes the timeout of the watchdog
  timer device. It returns 0 on success, -EINVAL for "parameter out of range"
-  and -EIO for "could not write value to the watchdog". On success the timeout
+  and -EIO for "could not write value to the watchdog". On success this
-  value of the watchdog_device will be changed to the value that was just used
+  routine should set the timeout value of the watchdog_device to the
-  to re-program the watchdog timer device.
+  achieved timeout value (which may be different from the requested one
+  because the watchdog does not necessarily has a 1 second resolution).
  (Note: the WDIOF_SETTIMEOUT needs to be set in the options field of the
  watchdog's info structure).
+* get_timeleft: this routines returns the time that's left before a reset.
 * ioctl: if this routine is present then it will be called first before we do
  our own internal ioctl call handling. This routine should return -ENOIOCTLCMD
  if a command is not supported. The parameters that are passed to the ioctl