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

Commit c7f9a6f3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into perf/core 



Merge reason: Pick up perf fixes that are now upstream

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents fe4b04fa 8dbdea84

Documentation/feature-removal-schedule.txt

+16 −0
Original line number Diff line number Diff line
@@ -603,3 +603,19 @@ Why: The adm9240, w83792d and w83793 hardware monitoring drivers have 
Who:	Jean Delvare <khali@linux-fr.org>



----------------------------



What:	noswapaccount kernel command line parameter

When:	2.6.40

Why:	The original implementation of memsw feature enabled by

	CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount

	kernel parameter (introduced in 2.6.29-rc1). Later on, this decision

	turned out to be not ideal because we cannot have the feature compiled

	in and disabled by default and let only interested to enable it

	(e.g. general distribution kernels might need it). Therefore we have

	added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides

	the both possibilities. If we remove noswapaccount we will have

	less command line parameters with the same functionality and we

	can also cleanup the parameter handling a bit ().

Who:	Michal Hocko <mhocko@suse.cz>



----------------------------

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ tcp_cookie_size - INTEGER 
tcp_dsack - BOOLEAN

	Allows TCP to send "duplicate" SACKs.



tcp_ecn - BOOLEAN

tcp_ecn - INTEGER

	Enable Explicit Congestion Notification (ECN) in TCP. ECN is only

	used when both ends of the TCP flow support it. It is useful to

	avoid losses due to congestion (when the bottleneck router supports

Documentation/scheduler/sched-stats.txt

+15 −18
Original line number Diff line number Diff line 
Version 15 of schedstats dropped counters for some sched_yield:

yld_exp_empty, yld_act_empty and yld_both_empty. Otherwise, it is

identical to version 14.



Version 14 of schedstats includes support for sched_domains, which hit the

mainline kernel in 2.6.20 although it is identical to the stats from version

12 which was in the kernel from 2.6.13-2.6.19 (version 13 never saw a kernel
@@ -28,32 +32,25 @@ to write their own scripts, the fields are described here. 


CPU statistics

--------------

cpu<N> 1 2 3 4 5 6 7 8 9 10 11 12



NOTE: In the sched_yield() statistics, the active queue is considered empty

    if it has only one process in it, since obviously the process calling

    sched_yield() is that process.

cpu<N> 1 2 3 4 5 6 7 8 9



First four fields are sched_yield() statistics:

     1) # of times both the active and the expired queue were empty

     2) # of times just the active queue was empty

     3) # of times just the expired queue was empty

     4) # of times sched_yield() was called

First field is a sched_yield() statistic:

     1) # of times sched_yield() was called



Next three are schedule() statistics:

     5) # of times we switched to the expired queue and reused it

     6) # of times schedule() was called

     7) # of times schedule() left the processor idle

     2) # of times we switched to the expired queue and reused it

     3) # of times schedule() was called

     4) # of times schedule() left the processor idle



Next two are try_to_wake_up() statistics:

     8) # of times try_to_wake_up() was called

     9) # of times try_to_wake_up() was called to wake up the local cpu

     5) # of times try_to_wake_up() was called

     6) # of times try_to_wake_up() was called to wake up the local cpu



Next three are statistics describing scheduling latency:

    10) sum of all time spent running by tasks on this processor (in jiffies)

    11) sum of all time spent waiting to run by tasks on this processor (in

     7) sum of all time spent running by tasks on this processor (in jiffies)

     8) sum of all time spent waiting to run by tasks on this processor (in

        jiffies)

    12) # of timeslices run on this cpu

     9) # of timeslices run on this cpu





Domain statistics

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ Conexant 5066 
=============

  laptop	Basic Laptop config (default)

  hp-laptop	HP laptops, e g G60

  asus		Asus K52JU, Lenovo G560

  dell-laptop	Dell laptops

  dell-vostro	Dell Vostro

  olpc-xo-1_5	OLPC XO 1.5

MAINTAINERS

+16 −13
Original line number Diff line number Diff line
@@ -978,6 +978,8 @@ S: Maintained 
F:	arch/arm/plat-samsung/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s5p/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*



ARM/S3C2410 ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>
@@ -5549,12 +5551,11 @@ S: Supported 
F:	drivers/scsi/be2iscsi/



SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER

M:	Sathya Perla <sathyap@serverengines.com>

M:	Subbu Seetharaman <subbus@serverengines.com>

M:	Sarveshwar Bandi <sarveshwarb@serverengines.com>

M:	Ajit Khaparde <ajitk@serverengines.com>

M:	Sathya Perla <sathya.perla@emulex.com>

M:	Subbu Seetharaman <subbu.seetharaman@emulex.com>

M:	Ajit Khaparde <ajit.khaparde@emulex.com>

L:	netdev@vger.kernel.org

W:	http://www.serverengines.com

W:	http://www.emulex.com

S:	Supported

F:	drivers/net/benet/
@@ -5614,18 +5615,20 @@ F: include/linux/sfi*.h 


SIMTEC EB110ATX (Chalice CATS)

P:	Ben Dooks

M:	Vincent Sanders <support@simtec.co.uk>

P:	Vincent Sanders <vince@simtec.co.uk>

M:	Simtec Linux Team <linux@simtec.co.uk>

W:	http://www.simtec.co.uk/products/EB110ATX/

S:	Supported



SIMTEC EB2410ITX (BAST)

P:	Ben Dooks

M:	Vincent Sanders <support@simtec.co.uk>

P:	Vincent Sanders <vince@simtec.co.uk>

M:	Simtec Linux Team <linux@simtec.co.uk>

W:	http://www.simtec.co.uk/products/EB2410ITX/

S:	Supported

F:	arch/arm/mach-s3c2410/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	arch/arm/mach-s3c2410/mach-bast.c

F:	arch/arm/mach-s3c2410/bast-ide.c

F:	arch/arm/mach-s3c2410/bast-irq.c



TI DAVINCI MACHINE SUPPORT

M:	Kevin Hilman <khilman@deeprootsystems.com>
@@ -6783,12 +6786,12 @@ S: Maintained 
F:	drivers/net/wireless/wl1251/*



WL1271 WIRELESS DRIVER

M:	Luciano Coelho <luciano.coelho@nokia.com>

M:	Luciano Coelho <coelho@ti.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git

S:	Maintained

F:	drivers/net/wireless/wl12xx/wl1271*

F:	drivers/net/wireless/wl12xx/

F:	include/linux/wl12xx.h



WL3501 WIRELESS PCMCIA CARD DRIVER