---

yaml
---
r: 172936
b: refs/heads/master
c: 59131d8
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 476d42f138ba82389a92a894d8a630a70d36278f
+refs/heads/master: 59131d8e0ae91f2e94909e0795923c4c7ee7eb8c

trunk/Documentation/ABI/testing/sysfs-devices-cache_disable

@@ -0,0 +1,18 @@
+What:      /sys/devices/system/cpu/cpu*/cache/index*/cache_disable_X
+Date:      August 2008
+KernelVersion:	2.6.27
+Contact:	mark.langsdorf@amd.com
+Description:	These files exist in every cpu's cache index directories.
+		There are currently 2 cache_disable_# files in each
+		directory.  Reading from these files on a supported
+		processor will return that cache disable index value
+		for that processor and node.  Writing to one of these
+		files will cause the specificed cache index to be disabled.
+
+		Currently, only AMD Family 10h Processors support cache index
+		disable, and only for their L3 caches.  See the BIOS and
+		Kernel Developer's Guide at
+		http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/31116-Public-GH-BKDG_3.20_2-4-09.pdf
+		for formatting information and other details on the
+		cache index disable.
+Users:    joachim.deguara@amd.com

trunk/Documentation/cputopology.txt

@@ -1,28 +1,15 @@
 
-Export CPU topology info via sysfs. Items (attributes) are similar
+Export cpu topology info via sysfs. Items (attributes) are similar
 to /proc/cpuinfo.
 
 1) /sys/devices/system/cpu/cpuX/topology/physical_package_id:
-
-	physical package id of cpuX. Typically corresponds to a physical
-	socket number, but the actual value is architecture and platform
-	dependent.
-
+represent the physical package id of  cpu X;
 2) /sys/devices/system/cpu/cpuX/topology/core_id:
-
-	the CPU core ID of cpuX. Typically it is the hardware platform's
-	identifier (rather than the kernel's).  The actual value is
-	architecture and platform dependent.
-
+represent the cpu core id to cpu X;
 3) /sys/devices/system/cpu/cpuX/topology/thread_siblings:
-
-	internel kernel map of cpuX's hardware threads within the same
-	core as cpuX
-
+represent the thread siblings to cpu X in the same core;
 4) /sys/devices/system/cpu/cpuX/topology/core_siblings:
-
-	internal kernel map of cpuX's hardware threads within the same
-	physical_package_id.
+represent the thread siblings to cpu X in the same physical package;
 
 To implement it in an architecture-neutral way, a new source file,
 drivers/base/topology.c, is to export the 4 attributes.
@@ -45,32 +32,32 @@ not defined by include/asm-XXX/topology.h:
 3) thread_siblings: just the given CPU
 4) core_siblings: just the given CPU
 
-Additionally, CPU topology information is provided under
+Additionally, cpu topology information is provided under
 /sys/devices/system/cpu and includes these files.  The internal
 source for the output is in brackets ("[]").
 
-    kernel_max: the maximum CPU index allowed by the kernel configuration.
+    kernel_max: the maximum cpu index allowed by the kernel configuration.
 		[NR_CPUS-1]
 
-    offline:	CPUs that are not online because they have been
+    offline:	cpus that are not online because they have been
 		HOTPLUGGED off (see cpu-hotplug.txt) or exceed the limit
-		of CPUs allowed by the kernel configuration (kernel_max
+		of cpus allowed by the kernel configuration (kernel_max
 		above). [~cpu_online_mask + cpus >= NR_CPUS]
 
-    online:	CPUs that are online and being scheduled [cpu_online_mask]
+    online:	cpus that are online and being scheduled [cpu_online_mask]
 
-    possible:	CPUs that have been allocated resources and can be
+    possible:	cpus that have been allocated resources and can be
 		brought online if they are present. [cpu_possible_mask]
 
-    present:	CPUs that have been identified as being present in the
+    present:	cpus that have been identified as being present in the
 		system. [cpu_present_mask]
 
 The format for the above output is compatible with cpulist_parse()
 [see <linux/cpumask.h>].  Some examples follow.
 
-In this example, there are 64 CPUs in the system but cpus 32-63 exceed
+In this example, there are 64 cpus in the system but cpus 32-63 exceed
 the kernel max which is limited to 0..31 by the NR_CPUS config option
-being 32.  Note also that CPUs 2 and 4-31 are not online but could be
+being 32.  Note also that cpus 2 and 4-31 are not online but could be
 brought online as they are both present and possible.
 
      kernel_max: 31
@@ -80,8 +67,8 @@ brought online as they are both present and possible.
         present: 0-31
 
 In this example, the NR_CPUS config option is 128, but the kernel was
-started with possible_cpus=144.  There are 4 CPUs in the system and cpu2
-was manually taken offline (and is the only CPU that can be brought
+started with possible_cpus=144.  There are 4 cpus in the system and cpu2
+was manually taken offline (and is the only cpu that can be brought
 online.)
 
      kernel_max: 127
@@ -91,4 +78,4 @@ online.)
         present: 0-3
 
 See cpu-hotplug.txt for the possible_cpus=NUM kernel start parameter
-as well as more information on the various cpumasks.
+as well as more information on the various cpumask's.

trunk/Documentation/feature-removal-schedule.txt

@@ -418,14 +418,6 @@ When:	2.6.33
 Why:	Should be implemented in userspace, policy daemon.
 Who:	Johannes Berg <johannes@sipsolutions.net>
 
----------------------------
-
-What:	CONFIG_INOTIFY
-When:	2.6.33
-Why:	last user (audit) will be converted to the newer more generic
-	and more easily maintained fsnotify subsystem
-Who:	Eric Paris <eparis@redhat.com>
-
 ----------------------------
 
 What:	lock_policy_rwsem_* and unlock_policy_rwsem_* will not be

trunk/Documentation/hwmon/sysfs-interface

@@ -353,20 +353,10 @@ power[1-*]_average		Average power use
 				Unit: microWatt
 				RO
 
-power[1-*]_average_interval	Power use averaging interval.  A poll
-				notification is sent to this file if the
-				hardware changes the averaging interval.
+power[1-*]_average_interval	Power use averaging interval
 				Unit: milliseconds
 				RW
 
-power[1-*]_average_interval_max	Maximum power use averaging interval
-				Unit: milliseconds
-				RO
-
-power[1-*]_average_interval_min	Minimum power use averaging interval
-				Unit: milliseconds
-				RO
-
 power[1-*]_average_highest	Historical average maximum power use
 				Unit: microWatt
 				RO
@@ -375,18 +365,6 @@ power[1-*]_average_lowest	Historical average minimum power use
 				Unit: microWatt
 				RO
 
-power[1-*]_average_max		A poll notification is sent to
-				power[1-*]_average when power use
-				rises above this value.
-				Unit: microWatt
-				RW
-
-power[1-*]_average_min		A poll notification is sent to
-				power[1-*]_average when power use
-				sinks below this value.
-				Unit: microWatt
-				RW
-
 power[1-*]_input		Instantaneous power use
 				Unit: microWatt
 				RO
@@ -403,39 +381,6 @@ power[1-*]_reset_history	Reset input_highest, input_lowest,
 				average_highest and average_lowest.
 				WO
 
-power[1-*]_accuracy		Accuracy of the power meter.
-				Unit: Percent
-				RO
-
-power[1-*]_alarm		1 if the system is drawing more power than the
-				cap allows; 0 otherwise.  A poll notification is
-				sent to this file when the power use exceeds the
-				cap.  This file only appears if the cap is known
-				to be enforced by hardware.
-				RO
-
-power[1-*]_cap			If power use rises above this limit, the
-				system should take action to reduce power use.
-				A poll notification is sent to this file if the
-				cap is changed by the hardware.  The *_cap
-				files only appear if the cap is known to be
-				enforced by hardware.
-				Unit: microWatt
-				RW
-
-power[1-*]_cap_hyst		Margin of hysteresis built around capping and
-				notification.
-				Unit: microWatt
-				RW
-
-power[1-*]_cap_max		Maximum cap that can be set.
-				Unit: microWatt
-				RO
-
-power[1-*]_cap_min		Minimum cap that can be set.
-				Unit: microWatt
-				RO
-
 **********
 * Energy *
 **********

trunk/Documentation/lguest/lguest.c

@@ -42,6 +42,7 @@
 #include <signal.h>
 #include "linux/lguest_launcher.h"
 #include "linux/virtio_config.h"
+#include <linux/virtio_ids.h>
 #include "linux/virtio_net.h"
 #include "linux/virtio_blk.h"
 #include "linux/virtio_console.h"