---

yaml
---
r: 3433
b: refs/heads/master
c: 3e1d1d2
h: refs/heads/master
i:
  3431: ff4812f
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98e7f29418a4931f97e6b78d1ef3a47103fe6cd5
+refs/heads/master: 3e1d1d28d99dabe63c64f7f40f1ca1d646de1f73

trunk/Documentation/00-INDEX

@@ -138,8 +138,6 @@ java.txt
 	- info on the in-kernel binary support for Java(tm).
 kbuild/
 	- directory with info about the kernel build process.
-kdumpt.txt
-       - mini HowTo on getting the crash dump code to work.
 kernel-doc-nano-HOWTO.txt
 	- mini HowTo on generation and location of kernel documentation files.
 kernel-docs.txt

trunk/Documentation/SubmittingPatches

@@ -299,7 +299,7 @@ can certify the below:
 
 then you just add a line saying
 
-	Signed-off-by: Random J Developer <random@developer.example.org>
+	Signed-off-by: Random J Developer <random@developer.org>
 
 Some people also put extra tags at the end.  They'll just be ignored for
 now, but you can do this to mark internal company procedures or just

trunk/Documentation/cdrom/sbpcd

@@ -419,7 +419,6 @@ into the file "track01":
  */
 #include <stdio.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <linux/cdrom.h>
 
 static struct cdrom_tochdr hdr;
@@ -430,7 +429,7 @@ static int datafile, drive;
 static int i, j, limit, track, err;
 static char filename[32];
 
-int main(int argc, char *argv[])
+main(int argc, char *argv[])
 {
 /*
  * open /dev/cdrom
@@ -517,7 +516,6 @@ entry[track+1].cdte_addr.lba=entry[track].cdte_addr.lba+300;
 	}
       arg.addr.lba++;
     }
-    return 0;
 }
 /*===================== end program ========================================*/
 
@@ -566,16 +564,15 @@ Appendix -- the "cdtester" utility:
 #include <stdio.h>
 #include <malloc.h>
 #include <sys/ioctl.h>
-#include <sys/types.h>
 #include <linux/cdrom.h>
 
 #ifdef AZT_PRIVATE_IOCTLS
 #include <linux/../../drivers/cdrom/aztcd.h>
-#endif /* AZT_PRIVATE_IOCTLS */
+#endif AZT_PRIVATE_IOCTLS
 #ifdef SBP_PRIVATE_IOCTLS
 #include <linux/../../drivers/cdrom/sbpcd.h>
 #include <linux/fs.h>
-#endif /* SBP_PRIVATE_IOCTLS */
+#endif SBP_PRIVATE_IOCTLS
 
 struct cdrom_tochdr hdr;
 struct cdrom_tochdr tocHdr;
@@ -593,7 +590,7 @@ union
 	struct cdrom_msf msf;
 	unsigned char buf[CD_FRAMESIZE_RAW];
 } azt;
-#endif /* AZT_PRIVATE_IOCTLS */
+#endif AZT_PRIVATE_IOCTLS
 int i, i1, i2, i3, j, k;
 unsigned char sequence=0;
 unsigned char command[80];
@@ -741,7 +738,7 @@ void display(int size,unsigned char *buffer)
 	} 
 } 
 
-int main(int argc, char *argv[])
+main(int argc, char *argv[])
 {
 	printf("\nTesting tool for a CDROM driver's audio functions V0.1\n");
 	printf("(C) 1995 Eberhard Moenkeberg <emoenke@gwdg.de>\n");
@@ -1049,13 +1046,12 @@ int main(int argc, char *argv[])
 			rc=ioctl(drive,CDROMAUDIOBUFSIZ,j);
 			printf("%d frames granted.\n",rc);
 			break;
-#endif /* SBP_PRIVATE_IOCTLS */
+#endif SBP_PRIVATE_IOCTLS
 		default:
 			printf("unknown command: \"%s\".\n",command);
 			break;
 		}
 	}
-	return 0;
 }
 /*==========================================================================*/
 

trunk/Documentation/cpu-freq/governors.txt

@@ -9,7 +9,6 @@
 
 
 		    Dominik Brodowski  <linux@brodo.de>
-            some additions and corrections by Nico Golde <nico@ngolde.de>
 
 
 
@@ -26,7 +25,6 @@ Contents:
 2.1  Performance
 2.2  Powersave
 2.3  Userspace
-2.4  Ondemand
 
 3.   The Governor Interface in the CPUfreq Core
 
@@ -88,15 +86,15 @@ highest frequency within the borders of scaling_min_freq and
 scaling_max_freq.
 
 
-2.2 Powersave
+2.1 Powersave
 -------------
 
 The CPUfreq governor "powersave" sets the CPU statically to the
 lowest frequency within the borders of scaling_min_freq and
 scaling_max_freq.
 
 
-2.3 Userspace
+2.2 Userspace
 -------------
 
 The CPUfreq governor "userspace" allows the user, or any userspace
@@ -105,14 +103,6 @@ by making a sysfs file "scaling_setspeed" available in the CPU-device
 directory.
 
 
-2.4 Ondemand
-------------
-
-The CPUfreq govenor "ondemand" sets the CPU depending on the
-current usage. To do this the CPU must have the capability to
-switch the frequency very fast.
-
-
 
 3. The Governor Interface in the CPUfreq Core
 =============================================

trunk/Documentation/cpusets.txt

@@ -51,14 +51,6 @@ mems_allowed vector.
 
 If a cpuset is cpu or mem exclusive, no other cpuset, other than a direct
 ancestor or descendent, may share any of the same CPUs or Memory Nodes.
-A cpuset that is cpu exclusive has a sched domain associated with it.
-The sched domain consists of all cpus in the current cpuset that are not
-part of any exclusive child cpusets.
-This ensures that the scheduler load balacing code only balances
-against the cpus that are in the sched domain as defined above and not
-all of the cpus in the system. This removes any overhead due to
-load balancing code trying to pull tasks outside of the cpu exclusive
-cpuset only to be prevented by the tasks' cpus_allowed mask.
 
 User level code may create and destroy cpusets by name in the cpuset
 virtual file system, manage the attributes and permissions of these
@@ -92,9 +84,6 @@ This can be especially valuable on:
       and a database), or
     * NUMA systems running large HPC applications with demanding
       performance characteristics.
-    * Also cpu_exclusive cpusets are useful for servers running orthogonal
-      workloads such as RT applications requiring low latency and HPC
-      applications that are throughput sensitive
 
 These subsets, or "soft partitions" must be able to be dynamically
 adjusted, as the job mix changes, without impacting other concurrently
@@ -136,8 +125,6 @@ Cpusets extends these two mechanisms as follows:
  - A cpuset may be marked exclusive, which ensures that no other
    cpuset (except direct ancestors and descendents) may contain
    any overlapping CPUs or Memory Nodes.
-   Also a cpu_exclusive cpuset would be associated with a sched
-   domain.
  - You can list all the tasks (by pid) attached to any cpuset.
 
 The implementation of cpusets requires a few, simple hooks
@@ -149,9 +136,6 @@ into the rest of the kernel, none in performance critical paths:
    allowed in that tasks cpuset.
  - in sched.c migrate_all_tasks(), to keep migrating tasks within
    the CPUs allowed by their cpuset, if possible.
- - in sched.c, a new API partition_sched_domains for handling
-   sched domain changes associated with cpu_exclusive cpusets
-   and related changes in both sched.c and arch/ia64/kernel/domain.c
  - in the mbind and set_mempolicy system calls, to mask the requested
    Memory Nodes by what's allowed in that tasks cpuset.
  - in page_alloc, to restrict memory to allowed nodes.

trunk/Documentation/devices.txt

@@ -94,7 +94,6 @@ Your cooperation is appreciated.
 		  9 = /dev/urandom	Faster, less secure random number gen.
 		 10 = /dev/aio		Asyncronous I/O notification interface
 		 11 = /dev/kmsg		Writes to this come out as printk's
-		 12 = /dev/oldmem	Access to crash dump from kexec kernel
   1 block	RAM disk
 		  0 = /dev/ram0		First RAM disk
 		  1 = /dev/ram1		Second RAM disk

trunk/Documentation/dvb/bt8xx.txt

@@ -44,23 +44,26 @@ TwinHan (dst) are loaded automatically by the dvb-bt8xx device driver.
    $ modprobe dst
 
 The value 0x71 will override the PCI type detection for dvb-bt8xx,
-which is necessary for TwinHan cards.
+which  is necessary for TwinHan cards.
 
 If you're having an older card (blue color circuit) and card=0x71 locks
 your machine, try using 0x68, too. If that does not work, ask on the
 mailing list.
 
-The DST module takes a couple of useful parameters:
+The DST module takes a couple of useful parameters.
 
-a. verbose takes values 0 to 5. These values control the verbosity level.
-b. debug takes values 0 and 1. You can either disable or enable debugging.
-c. dst_addons takes values 0 and 0x20:
-- A value of 0 means it is a FTA card.
-- A value of 0x20 means it has a Conditional Access slot.
+verbose takes values 0 to 5. These values control the verbosity level.
+
+debug takes values 0 and 1. You can either disable or enable debugging.
+
+dst_addons takes values 0 and 0x20. A value of 0 means it is a FTA card.
+0x20 means it has a Conditional Access slot.
+
+The autodected values are determined bythe cards 'response
+string' which you can see in your logs e.g.
+
+dst_get_device_id: Recognise [DSTMCI]
 
-The autodetected values are determined by the "response string"
-of the card, which you can see in your logs:
-e.g.: dst_get_device_id: Recognize [DSTMCI]
 
 --
-Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham, Uwe Bugla
+Authors: Richard Walker, Jamie Honan, Michael Hunold, Manu Abraham

trunk/Documentation/feature-removal-schedule.txt

@@ -43,14 +43,6 @@ Who:	Randy Dunlap <rddunlap@osdl.org>
 
 ---------------------------
 
-What:	RAW driver (CONFIG_RAW_DRIVER)
-When:	December 2005
-Why:	declared obsolete since kernel 2.6.3
-	O_DIRECT can be used instead
-Who:	Adrian Bunk <bunk@stusta.de>
-
----------------------------
-
 What:	register_ioctl32_conversion() / unregister_ioctl32_conversion()
 When:	April 2005
 Why:	Replaced by ->compat_ioctl in file_operations and other method