Merge remote-tracking branch 'torvalds/master' into perf/core (40d02efa) · Commits · EulixOS / Software / Kernel

.mailmap

+3 −0

Original line number	Diff line number	Diff line
		@@ -135,6 +135,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
		@@ -371,6 +373,7 @@ Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
		Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
		Sebastian Reichel <sre@kernel.org> <sre@debian.org>
		Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
		Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
		Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
		Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
		Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

+18 −0

Original line number	Diff line number	Diff line
		@@ -5796,6 +5796,24 @@
		expediting. Set to zero to disable automatic
		expediting.

		srcutree.srcu_max_nodelay [KNL]
		Specifies the number of no-delay instances
		per jiffy for which the SRCU grace period
		worker thread will be rescheduled with zero
		delay. Beyond this limit, worker thread will
		be rescheduled with a sleep delay of one jiffy.

		srcutree.srcu_max_nodelay_phase [KNL]
		Specifies the per-grace-period phase, number of
		non-sleeping polls of readers. Beyond this limit,
		grace period worker thread will be rescheduled
		with a sleep delay of one jiffy, between each
		rescan of the readers, for a grace period phase.

		srcutree.srcu_retry_check_delay [KNL]
		Specifies number of microseconds of non-sleeping
		delay between each non-sleeping poll of readers.

		srcutree.small_contention_lim [KNL]
		Specifies the number of update-side contention
		events per jiffy will be tolerated before

+303 −60

File changed.

Preview size limit exceeded, changes collapsed.

+1 −5

Original line number	Diff line number	Diff line
		@@ -1052,11 +1052,7 @@ udp_rmem_min - INTEGER
		Default: 4K

		udp_wmem_min - INTEGER
		Minimal size of send buffer used by UDP sockets in moderation.
		Each UDP socket is able to use the size for sending data, even if
		total pages of UDP sockets exceed udp_mem pressure. The unit is byte.

		Default: 4K
		UDP does not have tx memory accounting and this tunable has no effect.

		RAW variables
		=============

+1 −1

Original line number	Diff line number	Diff line
		@@ -5658,7 +5658,7 @@ by a string of size ``name_size``.
		#define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT)
		#define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT)
		#define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT)
		#define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES
		#define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_BOOLEAN

		#define KVM_STATS_BASE_SHIFT 8
		#define KVM_STATS_BASE_MASK (0xF << KVM_STATS_BASE_SHIFT)