---

yaml
---
r: 245543
b: refs/heads/master
c: f4ad9bd
h: refs/heads/master
i:
  245541: 3ed9763
  245539: d437480
  245535: 3ee8572
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df48d8716eab9608fe93924e4ae06ff110e8674f
+refs/heads/master: f4ad9bd208c98f32a6f9136618e0b8bebe3fb370

trunk/Documentation/00-INDEX

@@ -328,6 +328,8 @@ sysrq.txt
 	- info on the magic SysRq key.
 telephony/
 	- directory with info on telephony (e.g. voice over IP) support.
+uml/
+	- directory with information about User Mode Linux.
 unicode.txt
 	- info on the Unicode character/font mapping used in Linux.
 unshare.txt

trunk/Documentation/ABI/testing/sysfs-power

@@ -158,17 +158,3 @@ Description:
 		successful, will make the kernel abort a subsequent transition
 		to a sleep state if any wakeup events are reported after the
 		write has returned.
-
-What:		/sys/power/reserved_size
-Date:		May 2011
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/power/reserved_size file allows user space to control
-		the amount of memory reserved for allocations made by device
-		drivers during the "device freeze" stage of hibernation.  It can
-		be written a string representing a non-negative integer that
-		will be used as the amount of memory to reserve for allocations
-		made by device drivers' "freeze" callbacks, in bytes.
-
-		Reading from this file will display the current value, which is
-		set to 1 MB by default.

trunk/Documentation/DocBook/genericirq.tmpl

@@ -191,8 +191,8 @@
 	<para>
 	Whenever an interrupt triggers, the lowlevel arch code calls into
 	the generic interrupt code by calling desc->handle_irq().
-	This highlevel IRQ handling function only uses desc->irq_data.chip
-	primitives referenced by the assigned chip descriptor structure.
+	This highlevel IRQ handling function only uses desc->chip primitives
+	referenced by the assigned chip descriptor structure.
 	</para>
     </sect1>
     <sect1 id="Highlevel_Driver_API">
@@ -206,11 +206,11 @@
 	  <listitem><para>enable_irq()</para></listitem>
 	  <listitem><para>disable_irq_nosync() (SMP only)</para></listitem>
 	  <listitem><para>synchronize_irq() (SMP only)</para></listitem>
-	  <listitem><para>irq_set_irq_type()</para></listitem>
-	  <listitem><para>irq_set_irq_wake()</para></listitem>
-	  <listitem><para>irq_set_handler_data()</para></listitem>
-	  <listitem><para>irq_set_chip()</para></listitem>
-	  <listitem><para>irq_set_chip_data()</para></listitem>
+	  <listitem><para>set_irq_type()</para></listitem>
+	  <listitem><para>set_irq_wake()</para></listitem>
+	  <listitem><para>set_irq_data()</para></listitem>
+	  <listitem><para>set_irq_chip()</para></listitem>
+	  <listitem><para>set_irq_chip_data()</para></listitem>
           </itemizedlist>
 	  See the autogenerated function documentation for details.
 	</para>
@@ -225,8 +225,6 @@
 	  <listitem><para>handle_fasteoi_irq</para></listitem>
 	  <listitem><para>handle_simple_irq</para></listitem>
 	  <listitem><para>handle_percpu_irq</para></listitem>
-	  <listitem><para>handle_edge_eoi_irq</para></listitem>
-	  <listitem><para>handle_bad_irq</para></listitem>
 	  </itemizedlist>
 	  The interrupt flow handlers (either predefined or architecture
 	  specific) are assigned to specific interrupts by the architecture
@@ -243,13 +241,13 @@
 		<programlisting>
 default_enable(struct irq_data *data)
 {
-	desc->irq_data.chip->irq_unmask(data);
+	desc->chip->irq_unmask(data);
 }
 
 default_disable(struct irq_data *data)
 {
 	if (!delay_disable(data))
-		desc->irq_data.chip->irq_mask(data);
+		desc->chip->irq_mask(data);
 }
 
 default_ack(struct irq_data *data)
@@ -286,9 +284,9 @@ noop(struct irq_data *data))
 		<para>
 		The following control flow is implemented (simplified excerpt):
 		<programlisting>
-desc->irq_data.chip->irq_mask_ack();
-handle_irq_event(desc->action);
-desc->irq_data.chip->irq_unmask();
+desc->chip->irq_mask();
+handle_IRQ_event(desc->action);
+desc->chip->irq_unmask();
 		</programlisting>
 		</para>
 	    </sect3>
@@ -302,8 +300,8 @@ desc->irq_data.chip->irq_unmask();
 		<para>
 		The following control flow is implemented (simplified excerpt):
 		<programlisting>
-handle_irq_event(desc->action);
-desc->irq_data.chip->irq_eoi();
+handle_IRQ_event(desc->action);
+desc->chip->irq_eoi();
 		</programlisting>
 		</para>
 	    </sect3>
@@ -317,17 +315,17 @@ desc->irq_data.chip->irq_eoi();
 		The following control flow is implemented (simplified excerpt):
 		<programlisting>
 if (desc->status &amp; running) {
-	desc->irq_data.chip->irq_mask_ack();
+	desc->chip->irq_mask();
 	desc->status |= pending | masked;
 	return;
 }
-desc->irq_data.chip->irq_ack();
+desc->chip->irq_ack();
 desc->status |= running;
 do {
 	if (desc->status &amp; masked)
-		desc->irq_data.chip->irq_unmask();
+		desc->chip->irq_unmask();
 	desc->status &amp;= ~pending;
-	handle_irq_event(desc->action);
+	handle_IRQ_event(desc->action);
 } while (status &amp; pending);
 desc->status &amp;= ~running;
 		</programlisting>
@@ -346,7 +344,7 @@ desc->status &amp;= ~running;
 		<para>
 		The following control flow is implemented (simplified excerpt):
 		<programlisting>
-handle_irq_event(desc->action);
+handle_IRQ_event(desc->action);
 		</programlisting>
 		</para>
    	    </sect3>
@@ -364,29 +362,12 @@ handle_irq_event(desc->action);
 		<para>
 		The following control flow is implemented (simplified excerpt):
 		<programlisting>
-if (desc->irq_data.chip->irq_ack)
-	desc->irq_data.chip->irq_ack();
-handle_irq_event(desc->action);
-if (desc->irq_data.chip->irq_eoi)
-        desc->irq_data.chip->irq_eoi();
+handle_IRQ_event(desc->action);
+if (desc->chip->irq_eoi)
+        desc->chip->irq_eoi();
 		</programlisting>
 		</para>
    	    </sect3>
-	    <sect3 id="EOI_Edge_IRQ_flow_handler">
-	 	<title>EOI Edge IRQ flow handler</title>
-		<para>
-		handle_edge_eoi_irq provides an abnomination of the edge
-		handler which is solely used to tame a badly wreckaged
-		irq controller on powerpc/cell.
-		</para>
-   	    </sect3>
-	    <sect3 id="BAD_IRQ_flow_handler">
-	 	<title>Bad IRQ flow handler</title>
-		<para>
-		handle_bad_irq is used for spurious interrupts which
-		have no real handler assigned..
-		</para>
-   	    </sect3>
 	</sect2>
 	<sect2 id="Quirks_and_optimizations">
 	<title>Quirks and optimizations</title>
@@ -429,7 +410,6 @@ if (desc->irq_data.chip->irq_eoi)
 	  <listitem><para>irq_mask_ack() - Optional, recommended for performance</para></listitem>
 	  <listitem><para>irq_mask()</para></listitem>
 	  <listitem><para>irq_unmask()</para></listitem>
-	  <listitem><para>irq_eoi() - Optional, required for eoi flow handlers</para></listitem>
 	  <listitem><para>irq_retrigger() - Optional</para></listitem>
 	  <listitem><para>irq_set_type() - Optional</para></listitem>
 	  <listitem><para>irq_set_wake() - Optional</para></listitem>
@@ -444,24 +424,32 @@ if (desc->irq_data.chip->irq_eoi)
   <chapter id="doirq">
      <title>__do_IRQ entry point</title>
      <para>
-	The original implementation __do_IRQ() was an alternative entry
-	point for all types of interrupts. It not longer exists.
+ 	The original implementation __do_IRQ() is an alternative entry
+	point for all types of interrupts.
      </para>
      <para>
 	This handler turned out to be not suitable for all
 	interrupt hardware and was therefore reimplemented with split
-	functionality for edge/level/simple/percpu interrupts. This is not
+	functionality for egde/level/simple/percpu interrupts. This is not
 	only a functional optimization. It also shortens code paths for
 	interrupts.
       </para>
+      <para>
+	To make use of the split implementation, replace the call to
+	__do_IRQ by a call to desc->handle_irq() and associate
+        the appropriate handler function to desc->handle_irq().
+	In most cases the generic handler implementations should
+	be sufficient.
+     </para>
   </chapter>
 
   <chapter id="locking">
      <title>Locking on SMP</title>
      <para>
 	The locking of chip registers is up to the architecture that
-	defines the chip primitives. The per-irq structure is
-	protected via desc->lock, by the generic layer.
+	defines the chip primitives. There is a chip->lock field that can be used
+	for serialization, but the generic layer does not touch it. The per-irq
+	structure is protected via desc->lock, by the generic layer.
      </para>
   </chapter>
   <chapter id="structs">

trunk/Documentation/DocBook/media-entities.tmpl

@@ -294,7 +294,6 @@
 <!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">
 <!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">
 <!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">
-<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">
 <!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml">
 <!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml">
 <!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">

trunk/Documentation/DocBook/v4l/media-ioc-setup-link.xml

@@ -34,7 +34,7 @@
       <varlistentry>
 	<term><parameter>request</parameter></term>
 	<listitem>
-	  <para>MEDIA_IOC_SETUP_LINK</para>
+	  <para>MEDIA_IOC_ENUM_LINKS</para>
 	</listitem>
       </varlistentry>
       <varlistentry>

trunk/Documentation/DocBook/v4l/pixfmt.xml

@@ -696,7 +696,6 @@ information.</para>
     &sub-packed-yuv;
     &sub-grey;
     &sub-y10;
-    &sub-y12;
     &sub-y16;
     &sub-yuyv;
     &sub-uyvy;