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

Commit 79a21d57 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent 

Pull a single UEFI fix from Ard:

- Reduce the severity of the notice that appears when the ESRT table points
  to memory that is not covered by the memory map. It is scaring our users
  and interfering with their nice splash screens. Note that the ESRT may still
  be perfectly usable, and is currently (to my knowledge) not widely used to
  begin with.
parents d1eb9814 822f5845

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/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/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -653,6 +653,9 @@ 
	cpuidle.off=1	[CPU_IDLE]

			disable the cpuidle sub-system



	cpufreq.off=1	[CPU_FREQ]

			disable the cpufreq sub-system



	cpu_init_udelay=N

			[X86] Delay for N microsec between assert and de-assert

			of APIC INIT to start processors.  This delay occurs
@@ -1183,6 +1186,12 @@ 
			functions that can be changed at run time by the

			set_graph_notrace file in the debugfs tracing directory.



	ftrace_graph_max_depth=<uint>

			[FTRACE] Used with the function graph tracer. This is

			the max depth it will trace into a function. This value

			can be changed at run time by the max_graph_depth file

			in the tracefs tracing directory. default: 0 (no limit)



	gamecon.map[2|3]=

			[HW,JOY] Multisystem joystick and NES/SNES/PSX pad

			support via parallel port (up to 5 devices per port)

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 ----------------------------------------------