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

.mailmap

+6 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ Jisheng Zhang <jszhang@kernel.org> <Jisheng.Zhang@synaptics.com>
		Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
		Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
		John Crispin <john@phrozen.org> <blogic@openwrt.org>
		John Keeping <john@keeping.me.uk> <john@metanate.com>
		John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
		John Stultz <johnstul@us.ibm.com>
		<jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
		@@ -365,6 +366,11 @@ Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
		Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
		Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
		Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
		Nikolay Aleksandrov <razor@blackwall.org> <naleksan@redhat.com>
		Nikolay Aleksandrov <razor@blackwall.org> <nikolay@redhat.com>
		Nikolay Aleksandrov <razor@blackwall.org> <nikolay@cumulusnetworks.com>
		Nikolay Aleksandrov <razor@blackwall.org> <nikolay@nvidia.com>
		Nikolay Aleksandrov <razor@blackwall.org> <nikolay@isovalent.com>
		Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
		Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
		Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>

CREDITS

+4 −0

Original line number	Diff line number	Diff line
		@@ -1706,6 +1706,10 @@ S: Panoramastrasse 18
		S: D-69126 Heidelberg
		S: Germany

		N: Neil Horman
		M: nhorman@tuxdriver.com
		D: SCTP protocol maintainer.

		N: Simon Horman
		M: horms@verge.net.au
		D: Renesas ARM/ARM64 SoC maintainer

Documentation/admin-guide/cgroup-v2.rst

+10 −12

Original line number	Diff line number	Diff line
		@@ -1213,23 +1213,25 @@ PAGE_SIZE multiple when read back.
		A read-write single value file which exists on non-root
		cgroups. The default is "max".

		Memory usage throttle limit. This is the main mechanism to
		control memory usage of a cgroup. If a cgroup's usage goes
		Memory usage throttle limit. If a cgroup's usage goes
		over the high boundary, the processes of the cgroup are
		throttled and put under heavy reclaim pressure.

		Going over the high limit never invokes the OOM killer and
		under extreme conditions the limit may be breached.
		under extreme conditions the limit may be breached. The high
		limit should be used in scenarios where an external process
		monitors the limited cgroup to alleviate heavy reclaim
		pressure.

		memory.max
		A read-write single value file which exists on non-root
		cgroups. The default is "max".

		Memory usage hard limit. This is the final protection
		mechanism. If a cgroup's memory usage reaches this limit and
		can't be reduced, the OOM killer is invoked in the cgroup.
		Under certain circumstances, the usage may go over the limit
		temporarily.
		Memory usage hard limit. This is the main mechanism to limit
		memory usage of a cgroup. If a cgroup's memory usage reaches
		this limit and can't be reduced, the OOM killer is invoked in
		the cgroup. Under certain circumstances, the usage may go
		over the limit temporarily.

		In default configuration regular 0-order allocations always
		succeed unless OOM killer chooses current task as a victim.
		@@ -1238,10 +1240,6 @@ PAGE_SIZE multiple when read back.
		Caller could retry them differently, return into userspace
		as -ENOMEM or silently ignore in cases like disk readahead.

		This is the ultimate protection mechanism. As long as the
		high limit is used and monitored properly, this limit's
		utility is limited to providing the final safety net.

		memory.reclaim
		A write-only nested-keyed file which exists for all cgroups.

Documentation/admin-guide/cifs/changes.rst

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,5 +5,5 @@ Changes
		See https://wiki.samba.org/index.php/LinuxCIFSKernel for summary
		information about fixes/improvements to CIFS/SMB2/SMB3 support (changes
		to cifs.ko module) by kernel version (and cifs internal module version).
		This may be easier to read than parsing the output of "git log fs/cifs"
		by release.
		This may be easier to read than parsing the output of
		"git log fs/smb/client" by release.

Documentation/admin-guide/cifs/usage.rst

+4 −4

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ Installation instructions

		If you have built the CIFS vfs as module (successfully) simply
		type ``make modules_install`` (or if you prefer, manually copy the file to
		the modules directory e.g. /lib/modules/2.4.10-4GB/kernel/fs/cifs/cifs.ko).
		the modules directory e.g. /lib/modules/6.3.0-060300-generic/kernel/fs/smb/client/cifs.ko).

		If you have built the CIFS vfs into the kernel itself, follow the instructions
		for your distribution on how to install a new kernel (usually you
		@@ -66,15 +66,15 @@ If cifs is built as a module, then the size and number of network buffers
		and maximum number of simultaneous requests to one server can be configured.
		Changing these from their defaults is not recommended. By executing modinfo::

		modinfo kernel/fs/cifs/cifs.ko
		modinfo <path to cifs.ko>

		on kernel/fs/cifs/cifs.ko the list of configuration changes that can be made
		on kernel/fs/smb/client/cifs.ko the list of configuration changes that can be made
		at module initialization time (by running insmod cifs.ko) can be seen.

		Recommendations
		===============

		To improve security the SMB2.1 dialect or later (usually will get SMB3) is now
		To improve security the SMB2.1 dialect or later (usually will get SMB3.1.1) is now
		the new default. To use old dialects (e.g. to mount Windows XP) use "vers=1.0"
		on mount (or vers=2.0 for Windows Vista). Note that the CIFS (vers=1.0) is
		much older and less secure than the default dialect SMB3 which includes