Commit 857286e4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core



To pick up fixes.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents 51f38242 007b350a
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br>
Felix Kuhling <fxkuehl@gmx.de>
Felix Kuhling <fxkuehl@gmx.de>
Felix Moeller <felix@derklecks.de>
Felix Moeller <felix@derklecks.de>
Filipe Lautert <filipe@icewall.org>
Filipe Lautert <filipe@icewall.org>
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
Franck Bui-Huu <vagabon.xyz@gmail.com>
Franck Bui-Huu <vagabon.xyz@gmail.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
@@ -212,6 +213,8 @@ Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
Mark Brown <broonie@sirena.org.uk>
Mark Brown <broonie@sirena.org.uk>
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
+1 −1
Original line number Original line Diff line number Diff line
@@ -6,4 +6,4 @@ Description:
	with the update that cpuidle governor can be changed at runtime in default,
	with the update that cpuidle governor can be changed at runtime in default,
	both current_governor and current_governor_ro co-exist under
	both current_governor and current_governor_ro co-exist under
	/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
	/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
	current_governor_ro obselete.
	current_governor_ro obsolete.
+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ Contact: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Description:
Description:
		The /sys/kernel/uids/<uid>/cpu_shares tunable is used
		The /sys/kernel/uids/<uid>/cpu_shares tunable is used
		to set the cpu bandwidth a user is allowed. This is a
		to set the cpu bandwidth a user is allowed. This is a
		propotional value. What that means is that if there
		proportional value. What that means is that if there
		are two users logged in, each with an equal number of
		are two users logged in, each with an equal number of
		shares, then they will get equal CPU bandwidth. Another
		shares, then they will get equal CPU bandwidth. Another
		example would be, if User A has shares = 1024 and user
		example would be, if User A has shares = 1024 and user
+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ Date: September. 2017
KernelVersion:	4.14
KernelVersion:	4.14
Contact:	Stephen Hemminger <sthemmin@microsoft.com>
Contact:	Stephen Hemminger <sthemmin@microsoft.com>
Description:	Directory for per-channel information
Description:	Directory for per-channel information
		NN is the VMBUS relid associtated with the channel.
		NN is the VMBUS relid associated with the channel.


What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
What:		/sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
Date:		September. 2017
Date:		September. 2017
+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ Date: April 2011
KernelVersion:	3.0
KernelVersion:	3.0
Contact:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Contact:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Description:
Description:
                The major:minor number (in hexidecimal) of the
                The major:minor number (in hexadecimal) of the
                physical device providing the storage for this backend
                physical device providing the storage for this backend
                block device.
                block device.


Loading