Merge tag 'kvm-s390-master-6.0-1' of... (29250ba5) · Commits · EulixOS / Software / Kernel

.get_maintainer.ignore

+2 −0

Original line number	Diff line number	Diff line
		Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Christoph Hellwig <hch@lst.de>
		Marc Gonzalez <marc.w.gonzalez@free.fr>

.mailmap

+4 −2

Original line number	Diff line number	Diff line
		@@ -98,8 +98,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
		Christian Marangi <ansuelsmth@gmail.com>
		Christophe Ricard <christophe.ricard@gmail.com>
		Christoph Hellwig <hch@lst.de>
		Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
		Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
		Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com>
		Corey Minyard <minyard@acm.org>
		Damian Hobson-Garcia <dhobsong@igel.co.jp>
		Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
		@@ -150,6 +149,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
		Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@linux.vnet.ibm.com>
		Guilherme G. Piccoli <kernel@gpiccoli.net> <gpiccoli@canonical.com>
		Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
		Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
		Gustavo Padovan <gustavo@las.ic.unicamp.br>
		@@ -253,6 +254,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
		Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
		Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
		Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
		Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
		Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
		Maciej W. Rozycki <macro@orcam.me.uk> <macro@linux-mips.org>

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0

Original line number	Diff line number	Diff line
		@@ -523,6 +523,7 @@ What: /sys/devices/system/cpu/vulnerabilities
		/sys/devices/system/cpu/vulnerabilities/tsx_async_abort
		/sys/devices/system/cpu/vulnerabilities/itlb_multihit
		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data
		/sys/devices/system/cpu/vulnerabilities/retbleed
		Date: January 2018
		Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
		Description: Information about CPU vulnerabilities

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

+14 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,20 @@ The possible values in this file are:
		* - 'Mitigation: Clear CPU buffers'
		- The processor is vulnerable and the CPU buffer clearing mitigation is
		enabled.
		* - 'Unknown: No mitigations'
		- The processor vulnerability status is unknown because it is
		out of Servicing period. Mitigation is not attempted.

		Definitions:
		------------

		Servicing period: The process of providing functional and security updates to
		Intel processors or platforms, utilizing the Intel Platform Update (IPU)
		process or other similar mechanisms.

		End of Servicing Updates (ESU): ESU is the date at which Intel will no
		longer provide Servicing, such as through IPU or other similar update
		processes. ESU dates will typically be aligned to end of quarter.

		If the processor is vulnerable then the following information is appended to
		the above information:

Documentation/admin-guide/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -5331,6 +5331,8 @@
		rodata= [KNL]
		on Mark read-only kernel memory as read-only (default).
		off Leave read-only kernel memory writable for debugging.
		full Mark read-only kernel memory and aliases as read-only
		[arm64]

		rockchip.usb_uart
		Enable the uart passthrough on the designated usb port