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

Commit c4ffa146 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-2.6.38/core' into for-next

parents 82cc2e4b e4ea0c16

Documentation/arm/OMAP/DSS

+4 −3
Original line number Diff line number Diff line
@@ -255,9 +255,10 @@ framebuffer parameters. 
Kernel boot arguments

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



vram=<size>

	- Amount of total VRAM to preallocate. For example, "10M". omapfb

	  allocates memory for framebuffers from VRAM.

vram=<size>[,<physaddr>]

	- Amount of total VRAM to preallocate and optionally a physical start

	  memory address. For example, "10M". omapfb allocates memory for

	  framebuffers from VRAM.



omapfb.mode=<display>:<mode>[,...]

	- Default video mode for specified displays. For example,

Documentation/cgroups/blkio-controller.txt

+27 −0
Original line number Diff line number Diff line
@@ -89,6 +89,33 @@ Throttling/Upper Limit policy 


 Limits for writes can be put using blkio.write_bps_device file.



Hierarchical Cgroups

====================

- Currently none of the IO control policy supports hierarhical groups. But

  cgroup interface does allow creation of hierarhical cgroups and internally

  IO policies treat them as flat hierarchy.



  So this patch will allow creation of cgroup hierarhcy but at the backend

  everything will be treated as flat. So if somebody created a hierarchy like

  as follows.



			root

			/  \

		     test1 test2

			|

		     test3



  CFQ and throttling will practically treat all groups at same level.



				pivot

			     /  |   \  \

			root  test1 test2  test3



  Down the line we can implement hierarchical accounting/control support

  and also introduce a new cgroup file "use_hierarchy" which will control

  whether cgroup hierarchy is viewed as flat or hierarchical by the policy..

  This is how memory controller also has implemented the things.



Various user visible config options

===================================

CONFIG_BLK_CGROUP

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -554,3 +554,13 @@ Why: This is a legacy interface which have been replaced by a more 
Who:    NeilBrown <neilb@suse.de>



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



What:	i2c_adapter.id

When:	June 2011

Why:	This field is deprecated. I2C device drivers shouldn't change their

	behavior based on the underlying I2C adapter. Instead, the I2C

	adapter driver should instantiate the I2C devices and provide the

	needed platform-specific information.

Who:	Jean Delvare <khali@linux-fr.org>



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

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ M: Magnus Damm <magnus.damm@gmail.com> 
L:	linux-sh@vger.kernel.org

W:	http://oss.renesas.com

Q:	http://patchwork.kernel.org/project/linux-sh/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git rmobile-latest

S:	Supported

F:	arch/arm/mach-shmobile/

F:	drivers/sh/
@@ -2435,6 +2435,7 @@ F: drivers/net/wan/sdla.c 
FRAMEBUFFER LAYER

L:	linux-fbdev@vger.kernel.org

W:	http://linux-fbdev.sourceforge.net/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git

S:	Orphan

F:	Documentation/fb/

F:	drivers/video/fb*
@@ -5705,7 +5706,7 @@ M: Paul Mundt <lethal@linux-sh.org> 
L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git sh-latest

S:	Supported

F:	Documentation/sh/

F:	arch/sh/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 37

EXTRAVERSION = -rc1

EXTRAVERSION = -rc2

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*