Merge drm/drm-next into drm-misc-next (ae75a043) · Commits · jan.koester / Linux

.mailmap

+7 −1

CREDITS

+41 −26

Original line number	Original line	Diff line number	Diff line
	@@ -740,6 +740,11 @@ S: (ask for current address)
	S: Portland, Oregon		S: Portland, Oregon
	S: USA		S: USA

			N: Jason Cooper
			D: ARM/Marvell SOC co-maintainer
			D: irqchip co-maintainer
			D: MVEBU PCI DRIVER co-maintainer

	N: Robin Cornelius		N: Robin Cornelius
	E: robincornelius@users.sourceforge.net		E: robincornelius@users.sourceforge.net
	D: Ralink rt2x00 WLAN driver		D: Ralink rt2x00 WLAN driver
	@@ -849,6 +854,12 @@ D: trivial hack to add variable address length routing to Rose.
	D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO		D: AX25-HOWTO, HAM-HOWTO, IPX-HOWTO, NET-2-HOWTO
	D: ax25-utils maintainer.		D: ax25-utils maintainer.

			N: Kamil Debski
			E: kamil@wypas.org
			D: Samsung S5P 2D graphics acceleration and Multi Format Codec drivers
			D: Samsung USB2 phy drivers
			D: PWM fan driver

	N: Helge Deller		N: Helge Deller
	E: deller@gmx.de		E: deller@gmx.de
	W: http://www.parisc-linux.org/		W: http://www.parisc-linux.org/
	@@ -2852,6 +2863,10 @@ D: IPX development and support
	N: Venkatesh Pallipadi (Venki)		N: Venkatesh Pallipadi (Venki)
	D: x86/HPET		D: x86/HPET

			N: Kyungmin Park
			E: kyungmin.park@samsung.com
			D: Samsung S5Pv210 and Exynos4210 mobile platforms

	N: David Parsons		N: David Parsons
	E: orc@pell.chi.il.us		E: orc@pell.chi.il.us
	D: improved memory detection code.		D: improved memory detection code.

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

+0 −24

Original line number	Original line	Diff line number	Diff line
	@@ -109,30 +109,6 @@ Description:
	When counting down the counter start from preset value		When counting down the counter start from preset value
	and fire event when reach 0.		and fire event when reach 0.

	What: /sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
	KernelVersion: 4.12
	Contact: benjamin.gaignard@st.com
	Description:
	Reading returns the list possible quadrature modes.

	What: /sys/bus/iio/devices/iio:deviceX/in_count0_quadrature_mode
	KernelVersion: 4.12
	Contact: benjamin.gaignard@st.com
	Description:
	Configure the device counter quadrature modes:

	channel_A:
	Encoder A input servers as the count input and B as
	the UP/DOWN direction control input.

	channel_B:
	Encoder B input serves as the count input and A as
	the UP/DOWN direction control input.

	quadrature:
	Encoder A and B inputs are mixed to get direction
	and count with a scale of 0.25.

	What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available		What: /sys/bus/iio/devices/iio:deviceX/in_count_enable_mode_available
	KernelVersion: 4.12		KernelVersion: 4.12
	Contact: benjamin.gaignard@st.com		Contact: benjamin.gaignard@st.com

Documentation/admin-guide/bootconfig.rst

+15 −5

Original line number	Original line	Diff line number	Diff line
	@@ -137,15 +137,24 @@ Boot Kernel With a Boot Config
	==============================		==============================

	Since the boot configuration file is loaded with initrd, it will be added		Since the boot configuration file is loaded with initrd, it will be added
	to the end of the initrd (initramfs) image file with size, checksum and		to the end of the initrd (initramfs) image file with padding, size,
	12-byte magic word as below.		checksum and 12-byte magic word as below.

	[initrd][bootconfig][size(u32)][checksum(u32)][#BOOTCONFIG\n]		[initrd][bootconfig][padding][size(le32)][checksum(le32)][#BOOTCONFIG\n]

			The size and checksum fields are unsigned 32bit little endian value.

			When the boot configuration is added to the initrd image, the total
			file size is aligned to 4 bytes. To fill the gap, null characters
			(``\0``) will be added. Thus the ``size`` is the length of the bootconfig
			file + padding bytes.

	The Linux kernel decodes the last part of the initrd image in memory to		The Linux kernel decodes the last part of the initrd image in memory to
	get the boot configuration data.		get the boot configuration data.
	Because of this "piggyback" method, there is no need to change or		Because of this "piggyback" method, there is no need to change or
	update the boot loader and the kernel image itself.		update the boot loader and the kernel image itself as long as the boot
			loader passes the correct initrd file size. If by any chance, the boot
			loader passes a longer size, the kernel feils to find the bootconfig data.

	To do this operation, Linux kernel provides "bootconfig" command under		To do this operation, Linux kernel provides "bootconfig" command under
	tools/bootconfig, which allows admin to apply or delete the config file		tools/bootconfig, which allows admin to apply or delete the config file
	@@ -176,7 +185,8 @@ up to 512 key-value pairs. If keys contains 3 words in average, it can
	contain 256 key-value pairs. In most cases, the number of config items		contain 256 key-value pairs. In most cases, the number of config items
	will be under 100 entries and smaller than 8KB, so it would be enough.		will be under 100 entries and smaller than 8KB, so it would be enough.
	If the node number exceeds 1024, parser returns an error even if the file		If the node number exceeds 1024, parser returns an error even if the file
	size is smaller than 32KB.		size is smaller than 32KB. (Note that this maximum size is not including
			the padding null characters.)
	Anyway, since bootconfig command verifies it when appending a boot config		Anyway, since bootconfig command verifies it when appending a boot config
	to initrd image, user can notice it before boot.		to initrd image, user can notice it before boot.

Documentation/admin-guide/kernel-parameters.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2858,6 +2858,8 @@
	mds=off [X86]		mds=off [X86]
	tsx_async_abort=off [X86]		tsx_async_abort=off [X86]
	kvm.nx_huge_pages=off [X86]		kvm.nx_huge_pages=off [X86]
			no_entry_flush [PPC]
			no_uaccess_flush [PPC]

	Exceptions:		Exceptions:
	This does not have any effect on		This does not have any effect on
	@@ -3186,6 +3188,8 @@

	noefi Disable EFI runtime services support.		noefi Disable EFI runtime services support.

			no_entry_flush [PPC] Don't flush the L1-D cache when entering the kernel.

	noexec [IA-64]		noexec [IA-64]

	noexec [X86]		noexec [X86]
	@@ -3235,6 +3239,9 @@
	nospec_store_bypass_disable		nospec_store_bypass_disable
	[HW] Disable all mitigations for the Speculative Store Bypass vulnerability		[HW] Disable all mitigations for the Speculative Store Bypass vulnerability

			no_uaccess_flush
			[PPC] Don't flush the L1-D cache after accessing user data.

	noxsave [BUGS=X86] Disables x86 extended register state save		noxsave [BUGS=X86] Disables x86 extended register state save
	and restore using xsave. The kernel will fallback to		and restore using xsave. The kernel will fallback to
	enabling legacy floating-point and sse state.		enabling legacy floating-point and sse state.

Original line number	Original line	Diff line number	Diff line
	@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
	Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>		Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
	<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>		<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>		Dmitry Baryshkov <dbaryshkov@gmail.com>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>
			Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>		Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>		Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
	Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>		Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
	@@ -287,6 +290,7 @@ Santosh Shilimkar <ssantosh@kernel.org>
	Sarangdhar Joshi <spjoshi@codeaurora.org>		Sarangdhar Joshi <spjoshi@codeaurora.org>
	Sascha Hauer <s.hauer@pengutronix.de>		Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
			Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
	Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>		Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
	Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
	Sebastian Reichel <sre@kernel.org> <sre@debian.org>		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
	@@ -318,6 +322,8 @@ TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
			Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
			Uwe Kleine-König <ukleinek@strlen.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>