Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6297fabd authored by Corey Minyard's avatar Corey Minyard
Browse files

Merge branch 'modules-next' of... 

Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux

 into for-next

The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.

Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parents d7e17fe4 ece1996a

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com> 
James Bottomley <jejb@mulgrave.(none)>

James Bottomley <jejb@titanic.il.steeleye.com>

James E Wilson <wilson@specifix.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Ketrenos <jketreno@io.(none)>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10
Original line number Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead. 
		still used for tmpfs etc. other users.  If set to

		false, the global swap readahead algorithm will be

		used for all swappable pages.
 


What:		/sys/kernel/mm/swap/vma_ra_max_order

Date:		August 2017

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	The max readahead size in order for VMA based swap readahead



		VMA based swap readahead algorithm will readahead at

		most 1 << max_order pages for each readahead.  The

		real readahead size for each readahead will be scaled

		according to the estimation algorithm.

Documentation/ABI/testing/sysfs-power

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ Description: 


What;		/sys/power/pm_trace_dev_match

Date:		October 2010

Contact:	James Hogan <james@albanarts.com>

Contact:	James Hogan <jhogan@kernel.org>

Description:

		The /sys/power/pm_trace_dev_match file contains the name of the

		device associated with the last PM event point saved in the RTC

Documentation/core-api/workqueue.rst

+6 −6
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ up. 
Although MT wq wasted a lot of resource, the level of concurrency

provided was unsatisfactory.  The limitation was common to both ST and

MT wq albeit less severe on MT.  Each wq maintained its own separate

worker pool.  A MT wq could provide only one execution context per CPU

while a ST wq one for the whole system.  Work items had to compete for

worker pool.  An MT wq could provide only one execution context per CPU

while an ST wq one for the whole system.  Work items had to compete for

those very limited execution contexts leading to various problems

including proneness to deadlocks around the single execution context.
@@ -151,7 +151,7 @@ Application Programming Interface (API) 


``alloc_workqueue()`` allocates a wq.  The original

``create_*workqueue()`` functions are deprecated and scheduled for

removal.  ``alloc_workqueue()`` takes three arguments - @``name``,

removal.  ``alloc_workqueue()`` takes three arguments - ``@name``,

``@flags`` and ``@max_active``.  ``@name`` is the name of the wq and

also used as the name of the rescuer thread if there is one.
@@ -197,7 +197,7 @@ resources, scheduled and executed. 
  served by worker threads with elevated nice level.



  Note that normal and highpri worker-pools don't interact with

  each other.  Each maintain its separate pool of workers and

  each other.  Each maintains its separate pool of workers and

  implements concurrency management among its workers.



``WQ_CPU_INTENSIVE``
@@ -249,8 +249,8 @@ unbound worker-pools and only one work item could be active at any given 
time thus achieving the same ordering property as ST wq.



In the current implementation the above configuration only guarantees

ST behavior within a given NUMA node. Instead alloc_ordered_queue should

be used to achieve system wide ST behavior.

ST behavior within a given NUMA node. Instead ``alloc_ordered_queue()`` should

be used to achieve system-wide ST behavior.





Example Execution Scenarios

Documentation/cpu-freq/index.txt

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ cpufreq-stats.txt - General description of sysfs cpufreq stats. 


index.txt	-	File index, Mailing list and Links (this document)



intel-pstate.txt -	Intel pstate cpufreq driver specific file.



pcc-cpufreq.txt -	PCC cpufreq driver specific file.