Merge branch 'perf/core' into oprofile/master (de346b69) · Commits · 戴 / test

Documentation/hwmon/coretemp

+4 −10

Original line number	Diff line number	Diff line
		@@ -35,13 +35,6 @@ the Out-Of-Spec bit. Following table summarizes the exported sysfs files:
		All Sysfs entries are named with their core_id (represented here by 'X').
		tempX_input - Core temperature (in millidegrees Celsius).
		tempX_max - All cooling devices should be turned on (on Core2).
		Initialized with IA32_THERM_INTERRUPT. When the CPU
		temperature reaches this temperature, an interrupt is
		generated and tempX_max_alarm is set.
		tempX_max_hyst - If the CPU temperature falls below than temperature,
		an interrupt is generated and tempX_max_alarm is reset.
		tempX_max_alarm - Set if the temperature reaches or exceeds tempX_max.
		Reset if the temperature drops to or below tempX_max_hyst.
		tempX_crit - Maximum junction temperature (in millidegrees Celsius).
		tempX_crit_alarm - Set when Out-of-spec bit is set, never clears.
		Correct CPU operation is no longer guaranteed.
		@@ -49,9 +42,10 @@ tempX_label - Contains string "Core X", where X is processor
		number. For Package temp, this will be "Physical id Y",
		where Y is the package number.

		The TjMax temperature is set to 85 degrees C if undocumented model specific
		register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as
		(sometimes) documented in processor datasheet.
		On CPU models which support it, TjMax is read from a model-specific register.
		On other models, it is set to an arbitrary value based on weak heuristics.
		If these heuristics don't work for you, you can pass the correct TjMax value
		as a module parameter (tjmax).

		Appendix A. Known TjMax lists (TBD):
		Some information comes from ark.intel.com

Documentation/networking/ip-sysctl.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -1042,7 +1042,7 @@ conf/interface/*:
		The functional behaviour for certain settings is different
		depending on whether local forwarding is enabled or not.

		accept_ra - BOOLEAN
		accept_ra - INTEGER
		Accept Router Advertisements; autoconfigure using them.

		Possible values are:
		@@ -1106,7 +1106,7 @@ dad_transmits - INTEGER
		The amount of Duplicate Address Detection probes to send.
		Default: 1

		forwarding - BOOLEAN
		forwarding - INTEGER
		Configure interface-specific Host/Router behaviour.

		Note: It is recommended to have the same setting on all

Documentation/networking/scaling.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ configured. The number of entries in the global flow table is set through:

		The number of entries in the per-queue flow table are set through:

		/sys/class/net/<dev>/queues/tx-<n>/rps_flow_cnt
		/sys/class/net/<dev>/queues/rx-<n>/rps_flow_cnt

		== Suggested Configuration

Documentation/vm/transhuge.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -123,10 +123,11 @@ be automatically shutdown if it's set to "never".
		khugepaged runs usually at low frequency so while one may not want to
		invoke defrag algorithms synchronously during the page faults, it
		should be worth invoking defrag at least in khugepaged. However it's
		also possible to disable defrag in khugepaged:
		also possible to disable defrag in khugepaged by writing 0 or enable
		defrag in khugepaged by writing 1:

		echo yes >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag
		echo no >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag
		echo 0 >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag
		echo 1 >/sys/kernel/mm/transparent_hugepage/khugepaged/defrag

		You can also control how many pages khugepaged should scan at each
		pass:

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -6374,7 +6374,6 @@ S: Supported
		F: arch/arm/mach-tegra

		TEHUTI ETHERNET DRIVER
		M: Alexander Indenbaum <baum@tehutinetworks.net>
		M: Andy Gospodarek <andy@greyhouse.net>
		L: netdev@vger.kernel.org
		S: Supported

Admin message