Commit e8cd29b7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge Linus's staging merge point into staging-next 



This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 7e739297 73996933

Documentation/core-api/genericirq.rst

+8 −8
Original line number Diff line number Diff line
@@ -225,9 +225,9 @@ interrupts. 


The following control flow is implemented (simplified excerpt)::



    :c:func:`desc->irq_data.chip->irq_mask_ack`;

    desc->irq_data.chip->irq_mask_ack();

    handle_irq_event(desc->action);

    :c:func:`desc->irq_data.chip->irq_unmask`;

    desc->irq_data.chip->irq_unmask();





Default Fast EOI IRQ flow handler
@@ -239,7 +239,7 @@ which only need an EOI at the end of the handler. 
The following control flow is implemented (simplified excerpt)::



    handle_irq_event(desc->action);

    :c:func:`desc->irq_data.chip->irq_eoi`;

    desc->irq_data.chip->irq_eoi();





Default Edge IRQ flow handler
@@ -251,15 +251,15 @@ interrupts. 
The following control flow is implemented (simplified excerpt)::



    if (desc->status & running) {

        :c:func:`desc->irq_data.chip->irq_mask_ack`;

        desc->irq_data.chip->irq_mask_ack();

        desc->status |= pending | masked;

        return;

    }

    :c:func:`desc->irq_data.chip->irq_ack`;

    desc->irq_data.chip->irq_ack();

    desc->status |= running;

    do {

        if (desc->status & masked)

            :c:func:`desc->irq_data.chip->irq_unmask`;

            desc->irq_data.chip->irq_unmask();

        desc->status &= ~pending;

        handle_irq_event(desc->action);

    } while (status & pending);
@@ -293,10 +293,10 @@ simplified version without locking. 
The following control flow is implemented (simplified excerpt)::



    if (desc->irq_data.chip->irq_ack)

        :c:func:`desc->irq_data.chip->irq_ack`;

        desc->irq_data.chip->irq_ack();

    handle_irq_event(desc->action);

    if (desc->irq_data.chip->irq_eoi)

            :c:func:`desc->irq_data.chip->irq_eoi`;

        desc->irq_data.chip->irq_eoi();





EOI Edge IRQ flow handler

Documentation/devicetree/bindings/gpio/gpio-pca953x.txt

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Required properties: 
	ti,tca6424

	ti,tca9539

	ti,tca9554

	onsemi,pca9654

	onnn,pca9654

	exar,xra1202



Optional properties:

Documentation/devicetree/bindings/hwmon/jc42.txt

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ Required properties: 


- reg: I2C address



Optional properties:

- smbus-timeout-disable: When set, the smbus timeout function will be disabled.

			 This is not supported on all chips.



Example:



temp-sensor@1a {

Documentation/driver-api/dmaengine/client.rst

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ The details of these operations are: 
      void dma_async_issue_pending(struct dma_chan *chan);



Further APIs:

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

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



1. Terminate APIs

Documentation/driver-api/pci.rst

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ PCI Support Library 
.. kernel-doc:: drivers/pci/irq.c

   :export:



.. kernel-doc:: drivers/pci/htirq.c

   :export:



.. kernel-doc:: drivers/pci/probe.c

   :export: