---

yaml
---
r: 168269
b: refs/heads/master
c: 5a1eb5c
h: refs/heads/master
i:
  168267: 8c1d5f2
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c75910f1aa042be1dd769378d2611bf551721ac
+refs/heads/master: 5a1eb5c4453207ad9e7f6e8ca4f8db289743c993

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/filesystems/ext4.txt

@@ -134,15 +134,9 @@ ro                   	Mount filesystem read only. Note that ext4 will
                      	mount options "ro,noload" can be used to prevent
 		     	writes to the filesystem.
 
-journal_checksum	Enable checksumming of the journal transactions.
-			This will allow the recovery code in e2fsck and the
-			kernel to detect corruption in the kernel.  It is a
-			compatible change and will be ignored by older kernels.
-
 journal_async_commit	Commit block can be written to disk without waiting
 			for descriptor blocks. If enabled older kernels cannot
-			mount the device. This will enable 'journal_checksum'
-			internally.
+			mount the device.
 
 journal=update		Update the ext4 file system's journal to the current
 			format.

trunk/Documentation/sound/alsa/ALSA-Configuration.txt

@@ -522,7 +522,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     pcm_devs       - Number of PCM devices assigned to each card
                      (default = 1, up to 4)
     pcm_substreams - Number of PCM substreams assigned to each PCM
-                     (default = 8, up to 128)
+                     (default = 8, up to 16)
     hrtimer        - Use hrtimer (=1, default) or system timer (=0)
     fake_buffer    - Fake buffer allocations (default = 1)
 

trunk/Documentation/trace/ftrace.txt

@@ -1231,7 +1231,6 @@ something like this simple program:
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <string.h>
 
 #define _STR(x) #x
 #define STR(x) _STR(x)
@@ -1266,7 +1265,6 @@ const char *find_debugfs(void)
                return NULL;
        }
 
-       strcat(debugfs, "/tracing/");
        debugfs_found = 1;
 
        return debugfs;

trunk/Makefile

@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 32
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc5
 NAME = Man-Eating Seals of Antiquity
 
 # *DOCUMENTATION*

trunk/arch/arm/include/asm/cacheflush.h

@@ -414,14 +414,9 @@ extern void __flush_dcache_page(struct address_space *mapping, struct page *page
 
 static inline void __flush_icache_all(void)
 {
-#ifdef CONFIG_ARM_ERRATA_411920
-	extern void v6_icache_inval_all(void);
-	v6_icache_inval_all();
-#else
 	asm("mcr	p15, 0, %0, c7, c5, 0	@ invalidate I-cache\n"
 	    :
 	    : "r" (0));
-#endif
 }
 
 #define ARCH_HAS_FLUSH_ANON_PAGE