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

Commit 9dbdd6c4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'v2.6.32-rc4' into perf/core 



Merge reason: we were on an -rc1 base, merge up to -rc4.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 7a693d3f 16129139

Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

+28 −0
Original line number Diff line number Diff line
@@ -31,3 +31,31 @@ Date: March 2009 
Kernel Version: 2.6.30

Contact:	iss_storagedev@hp.com

Description:	A symbolic link to /sys/block/cciss!cXdY



Where:		/sys/bus/pci/devices/<dev>/ccissX/rescan

Date:		August 2009

Kernel Version:	2.6.31

Contact:	iss_storagedev@hp.com

Description:	Kicks of a rescan of the controller to discover logical

		drive topology changes.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/lunid

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the 8-byte LUN ID used to address logical

		drive Y of controller X.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/raid_level

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the RAID level of logical drive Y of

		controller X.



Where:		/sys/bus/pci/devices/<dev>/ccissX/cXdY/usage_count

Date:		August 2009

Kernel Version: 2.6.31

Contact:	iss_storagedev@hp.com

Description:	Displays the usage count (number of opens) of logical drive Y

		of controller X.

Documentation/SubmittingPatches

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ your e-mail client so that it sends your patches untouched. 
When sending patches to Linus, always follow step #7.



Large changes are not appropriate for mailing lists, and some

maintainers.  If your patch, uncompressed, exceeds 40 kB in size,

maintainers.  If your patch, uncompressed, exceeds 300 kB in size,

it is preferred that you store your patch on an Internet-accessible

server, and provide instead a URL (link) pointing to your patch.

Documentation/arm/tcm.txt

+6 −4
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ TCM location and size. Notice that this is not a MMU table: you 
actually move the physical location of the TCM around. At the

place you put it, it will mask any underlying RAM from the

CPU so it is usually wise not to overlap any physical RAM with

the TCM. The TCM memory exists totally outside the MMU and will

override any MMU mappings.

the TCM.



Code executing inside the ITCM does not "see" any MMU mappings

and e.g. register accesses must be made to physical addresses.

The TCM memory can then be remapped to another address again using

the MMU, but notice that the TCM if often used in situations where

the MMU is turned off. To avoid confusion the current Linux

implementation will map the TCM 1 to 1 from physical to virtual

memory in the location specified by the machine.



TCM is used for a few things:

Documentation/cgroups/cgroups.txt

+9 −2
Original line number Diff line number Diff line
@@ -227,7 +227,14 @@ as the path relative to the root of the cgroup file system. 
Each cgroup is represented by a directory in the cgroup file system

containing the following files describing that cgroup:



 - tasks: list of tasks (by pid) attached to that cgroup

 - tasks: list of tasks (by pid) attached to that cgroup.  This list

   is not guaranteed to be sorted.  Writing a thread id into this file

   moves the thread into this cgroup.

 - cgroup.procs: list of tgids in the cgroup.  This list is not

   guaranteed to be sorted or free of duplicate tgids, and userspace

   should sort/uniquify the list if this property is required.

   Writing a tgid into this file moves all threads with that tgid into

   this cgroup.

 - notify_on_release flag: run the release agent on exit?

 - release_agent: the path to use for release notifications (this file

   exists in the top cgroup only)
@@ -374,7 +381,7 @@ Now you want to do something with this cgroup. 


In this directory you can find several files:

# ls

notify_on_release tasks

cgroup.procs notify_on_release tasks

(plus whatever files added by the attached subsystems)



Now attach your shell to this cgroup:

Documentation/connector/cn_test.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static char cn_test_name[] = "cn_test"; 
static struct sock *nls;

static struct timer_list cn_test_timer;



static void cn_test_callback(struct cn_msg *msg)

static void cn_test_callback(struct cn_msg *msg, struct netlink_skb_parms *nsp)

{

	pr_info("%s: %lu: idx=%x, val=%x, seq=%u, ack=%u, len=%d: %s.\n",

	        __func__, jiffies, msg->id.idx, msg->id.val,