Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d06efebf authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block

 into for-3.18

This is to receive 0a30288d ("blk-mq, percpu_ref: implement a
kludge for SCSI blk-mq stall during probe") which implements
__percpu_ref_kill_expedited() to work around SCSI blk-mq stall.  The
commit reverted and patches to implement proper fix will be added.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
parents bb2e226b 0a30288d

Documentation/DocBook/drm.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -315,7 +315,7 @@ char *date;</synopsis> 
        <function>drm_dev_unregister()</function> followed by a call to

        <function>drm_dev_unregister()</function> followed by a call to

        <function>drm_dev_unref()</function>.

        <function>drm_dev_unref()</function>.

      </para>

      </para>

!Edrivers/gpu/drm/drm_stub.c

!Edrivers/gpu/drm/drm_drv.c

    </sect2>

    </sect2>

    <sect2>

    <sect2>

      <title>Driver Load</title>

      <title>Driver Load</title>

Documentation/SubmittingPatches

+1 −0
Original line number Original line Diff line number Diff line
@@ -794,6 +794,7 @@ Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer". 
  <http://www.kroah.com/log/linux/maintainer-03.html>

  <http://www.kroah.com/log/linux/maintainer-03.html>

  <http://www.kroah.com/log/linux/maintainer-04.html>

  <http://www.kroah.com/log/linux/maintainer-04.html>

  <http://www.kroah.com/log/linux/maintainer-05.html>

  <http://www.kroah.com/log/linux/maintainer-05.html>

  <http://www.kroah.com/log/linux/maintainer-06.html>





NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

  <https://lkml.org/lkml/2005/7/11/336>

  <https://lkml.org/lkml/2005/7/11/336>

Documentation/devicetree/bindings/dma/rcar-audmapp.txt

+3 −3
Original line number Original line Diff line number Diff line
@@ -16,9 +16,9 @@ Example: 
* DMA client

* DMA client





Required properties:

Required properties:

- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,

- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.

		where SRS/DRS values are fixed handles, specified in the SoC

		where SRS/DRS are specified in the SoC manual.

		manual as the value that would be written into the PDMACHCR.

		It will be written into PDMACHCR as high 16-bit parts.

- dma-names:	a list of DMA channel names, one per "dmas" entry

- dma-names:	a list of DMA channel names, one per "dmas" entry





Example:

Example:

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+9 −2
Original line number Original line Diff line number Diff line
@@ -11,10 +11,17 @@ Required properties: 




Optional properties for main touchpad device:

Optional properties for main touchpad device:





- linux,gpio-keymap: An array of up to 4 entries indicating the Linux

- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    keycode generated by each GPIO. Linux keycodes are defined in

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

    starting at the LSB. Linux keycodes are defined in

    <dt-bindings/input/input.h>.

    <dt-bindings/input/input.h>.





    Note: the numbering of the GPIOs and the bit they start at varies between

    maXTouch devices. You must either refer to the documentation, or

    experiment to determine which bit corresponds to which input. Use

    KEY_RESERVED for unused padding values.



Example:

Example:





	touch@4b {

	touch@4b {

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

+7 −5
Original line number Original line Diff line number Diff line
@@ -4,11 +4,13 @@ Specifying interrupt information for devices 
1) Interrupt client nodes

1) Interrupt client nodes

-------------------------

-------------------------





Nodes that describe devices which generate interrupts must contain an either an

Nodes that describe devices which generate interrupts must contain an

"interrupts" property or an "interrupts-extended" property. These properties

"interrupts" property, an "interrupts-extended" property, or both. If both are

contain a list of interrupt specifiers, one per output interrupt. The format of

present, the latter should take precedence; the former may be provided simply

the interrupt specifier is determined by the interrupt controller to which the

for compatibility with software that does not recognize the latter. These

interrupts are routed; see section 2 below for details.

properties contain a list of interrupt specifiers, one per output interrupt. The

format of the interrupt specifier is determined by the interrupt controller to

which the interrupts are routed; see section 2 below for details.





  Example:

  Example:

	interrupt-parent = <&intc1>;

	interrupt-parent = <&intc1>;