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

Commit 920c634a authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'irq-fixes-4.11-rc2' of... 

Merge tag 'irq-fixes-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent

Pull irqchip/irqdomain updates for 4.11-rc2 from Marc Zyngier

 - irqchip/crossbar: Some type tidying up
 - irqchip/gicv3-its: Workaround for a Qualcomm erratum
 - irqdomain: Compile for for systems that don't use CONFIG_IRQ_DOMAIN

Fixed up minor conflict in the crossbar driver.
parents b28ace12 4b9de5da

Documentation/DocBook/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
# list of DOCBOOKS.



DOCBOOKS := z8530book.xml  \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    kernel-hacking.xml kernel-locking.xml \

	    writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml scsi.xml \

	    sh.xml regulator.xml w1.xml \

	    sh.xml w1.xml \

	    writing_musb_glue_layer.xml



ifeq ($(DOCBOOKS),)

Documentation/IPMI.txt

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ and tell you when they come and go. 


Creating the User



To user the message handler, you must first create a user using

To use the message handler, you must first create a user using

ipmi_create_user.  The interface number specifies which SMI you want

to connect to, and you must supply callback functions to be called

when data comes in.  The callback function can run at interrupt level,

Documentation/PCI/pcieaer-howto.txt

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ After reboot with new kernel or insert the module, a device file named 


Then, you need a user space tool named aer-inject, which can be gotten

from:

    http://www.kernel.org/pub/linux/utils/pci/aer-inject/

    https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/



More information about aer-inject can be found in the document comes

with its source code.

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -68,3 +68,4 @@ stable kernels. 
|                |                 |                 |                             |

| Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |

| Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |

| Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ pygments_style = 'sphinx' 
# If true, `todo` and `todoList` produce output, else they produce nothing.

todo_include_todos = False



primary_domain = 'C'

primary_domain = 'c'

highlight_language = 'none'



# -- Options for HTML output ----------------------------------------------