---

yaml
---
r: 8915
b: refs/heads/master
c: 811265b
h: refs/heads/master
i:
  8913: 51f971f
  8911: 84d8237
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae01d2798d1825307044d75de11eb5c9ffb79c5a
+refs/heads/master: 811265b8e8bf84e3b91507bf6a3a8eea20e7a4b7

trunk/Documentation/aoe/mkshelf.sh

@@ -8,15 +8,13 @@ fi
 n_partitions=${n_partitions:-16}
 dir=$1
 shelf=$2
-nslots=16
-maxslot=`echo $nslots 1 - p | dc`
 MAJOR=152
 
 set -e
 
-minor=`echo $nslots \* $shelf \* $n_partitions | bc`
+minor=`echo 10 \* $shelf \* $n_partitions | bc`
 endp=`echo $n_partitions - 1 | bc`
-for slot in `seq 0 $maxslot`; do
+for slot in `seq 0 9`; do
 	for part in `seq 0 $endp`; do
 		name=e$shelf.$slot
 		test "$part" != "0" && name=${name}p$part

trunk/Documentation/cciss.txt

@@ -17,9 +17,7 @@ This driver is known to work with the following cards:
 	* SA P600
 	* SA P800
 	* SA E400
-	* SA P400i
-	* SA E200
-	* SA E200i
+	* SA E300
 
 If nodes are not already created in the /dev/cciss directory, run as root:
 

trunk/Documentation/dontdiff

@@ -55,7 +55,6 @@ aic7*seq.h*
 aicasm
 aicdb.h*
 asm
-asm-offsets.*
 asm_offsets.*
 autoconf.h*
 bbootsect

trunk/Documentation/fb/intel810.txt

@@ -5,7 +5,6 @@ Intel 810/815 Framebuffer driver
 	March 17, 2002
 
 	First Released: July 2001
-	Last Update:    September 12, 2005
 ================================================================
 
 A. Introduction
@@ -45,8 +44,6 @@ B.  Features
 
 	- Hardware Cursor Support
 
-	- Supports EDID probing either by DDC/I2C or through the BIOS
-
 C.  List of available options
 
    a. "video=i810fb"  
@@ -55,17 +52,14 @@ C.  List of available options
 	Recommendation: required
 
    b. "xres:<value>"  
-	select horizontal resolution in pixels. (This parameter will be
-	ignored if 'mode_option' is specified.  See 'o' below).
+	select horizontal resolution in pixels
 
 	Recommendation: user preference 
 	(default = 640)
 
    c. "yres:<value>"
 	select vertical resolution in scanlines. If Discrete Video Timings
-	is enabled, this will be ignored and computed as 3*xres/4.  (This
-	parameter will be ignored if 'mode_option' is specified.  See 'o'
-	below)  
+	is enabled, this will be ignored and computed as 3*xres/4.  
 
 	Recommendation: user preference
 	(default = 480)
@@ -92,17 +86,15 @@ C.  List of available options
    g. "hsync1/hsync2:<value>" 
 	select the minimum and maximum Horizontal Sync Frequency of the 
 	monitor in KHz.  If a using a fixed frequency monitor, hsync1 must 
-	be equal to hsync2. If EDID probing is successful, these will be
-	ignored and values will be taken from the EDID block.
+	be equal to hsync2. 
 
 	Recommendation: check monitor manual for correct values
 	default (29/30)
 
    h. "vsync1/vsync2:<value>" 
 	select the minimum and maximum Vertical Sync Frequency of the monitor
 	in Hz. You can also use this option to lock your monitor's refresh 
-	rate. If EDID probing is successful, these will be ignored and values
-	will be taken from the EDID block.
+	rate.
 
 	Recommendation: check monitor manual for correct values
 	(default = 60/60)
@@ -162,11 +154,7 @@ C.  List of available options
 
 	Recommendation: do not set
 	(default = not set)
-   o. <xres>x<yres>[-<bpp>][@<refresh>]
-	The driver will now accept specification of boot mode option.  If this
-	is specified, the options 'xres' and 'yres' will be ignored. See
-	Documentation/fb/modedb.txt for usage.
-
+
 D. Kernel booting
 
 Separate each option/option-pair by commas (,) and the option from its value
@@ -188,10 +176,7 @@ will be computed based on the hsync1/hsync2 and vsync1/vsync2 values.
 
 IMPORTANT:
 You must include hsync1, hsync2, vsync1 and vsync2 to enable video modes
-better than 640x480 at 60Hz. HOWEVER, if your chipset/display combination
-supports I2C and has an EDID block, you can safely exclude hsync1, hsync2,
-vsync1 and vsync2 parameters.  These parameters will be taken from the EDID
-block.
+better than 640x480 at 60Hz.
 
 E.  Module options
 
@@ -232,21 +217,32 @@ F.  Setup
 	   This is required.  The option is under "Character Devices"
 
 	d. Under "Graphics Support", select "Intel 810/815" either statically
-	   or as a module.  Choose "use VESA Generalized Timing Formula" if
-	   you need to maximize the capability of your display.  To be on the 
+	   or as a module.  Choose "use VESA GTF for video timings"  if you 
+	   need to maximize the capability of your display.  To be on the 
 	   safe side, you can leave this unselected.  
 
-	e. If you want support for DDC/I2C probing (Plug and Play Displays),
-	   set 'Enable DDC Support' to 'y'. To make this option appear, set
-	   'use VESA Generalized Timing Formula' to 'y'.
-
-        f. If you want a framebuffer console, enable it under "Console 
+        e. If you want a framebuffer console, enable it under "Console 
 	   Drivers"
 
-	g. Compile your kernel. 
+	f. Compile your kernel. 
 
-	h. Load the driver as described in section D and E.
+	g. Load the driver as described in section D and E.
 
+	Optional:	
+	h.  If you are going to run XFree86 with its native drivers, the 
+	    standard XFree86 4.1.0 and 4.2.0 drivers should work as is.
+            However, there's a bug in the XFree86 i810 drivers.  It attempts 
+	    to use XAA even when switched to the console. This will crash
+	    your server. I have a fix at this site:  
+
+	    http://i810fb.sourceforge.net.  
+
+	    You can either use the patch, or just replace 
+
+            /usr/X11R6/lib/modules/drivers/i810_drv.o
+
+	    with the one provided at the website. 	
+
 	i.  Try the DirectFB (http://www.directfb.org) + the i810 gfxdriver
 	    patch to see the chipset in action (or inaction :-).
 

trunk/Documentation/feature-removal-schedule.txt

@@ -17,6 +17,15 @@ Who:	Greg Kroah-Hartman <greg@kroah.com>
 
 ---------------------------
 
+What:	io_remap_page_range() (macro or function)
+When:	September 2005
+Why:	Replaced by io_remap_pfn_range() which allows more memory space
+	addressabilty (by using a pfn) and supports sparc & sparc64
+	iospace as part of the pfn.
+Who:	Randy Dunlap <rddunlap@osdl.org>
+
+---------------------------
+
 What:	RAW driver (CONFIG_RAW_DRIVER)
 When:	December 2005
 Why:	declared obsolete since kernel 2.6.3

trunk/Documentation/firmware_class/firmware_sample_driver.c

@@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size)
 	u8 buf[size+1];
 	memcpy(buf, firmware, size);
 	buf[size] = '\0';
-	printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
+	printk("firmware_sample_driver: firmware: %s\n", buf);
 }
 
 static void sample_probe_default(void)
 {
 	/* uses the default method to get the firmware */
         const struct firmware *fw_entry;
-	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
+	printk("firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
 	{
@@ -61,7 +61,7 @@ static void sample_probe_specific(void)
 
 	/* NOTE: This currently doesn't work */
 
-	printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
+	printk("firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
 	{
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
 		return;
 	}
 
-	printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
+	printk("firmware_sample_driver: device pointer \"%s\"\n",
 	       (char *)context);
 	sample_firmware_load(fw->data, fw->size);
 }

trunk/Documentation/kdump/kdump.txt

@@ -66,11 +66,11 @@ SETUP
    c) Enable "/proc/vmcore support" (Optional, in Pseudo filesystems).
 	CONFIG_PROC_VMCORE=y
    d) Disable SMP support and build a UP kernel (Until it is fixed).
-	CONFIG_SMP=n
+   	CONFIG_SMP=n
    e) Enable "Local APIC support on uniprocessors".
-	CONFIG_X86_UP_APIC=y
+   	CONFIG_X86_UP_APIC=y
    f) Enable "IO-APIC support on uniprocessors"
-	CONFIG_X86_UP_IOAPIC=y
+   	CONFIG_X86_UP_IOAPIC=y
 
   Note:   i) Options a) and b) depend upon "Configure standard kernel features
 	     (for small systems)" (under General setup).
@@ -95,11 +95,6 @@ SETUP
 	    hence have memory less than 4GB.
        iii) Specify "irqpoll" as command line parameter. This reduces driver
             initialization failures in second kernel due to shared interrupts.
-        iv) <root-dev> needs to be specified in a format corresponding to
-            the root device name in the output of mount command.
-         v) If you have built the drivers required to mount root file
-            system as modules in <second-kernel>, then, specify
-            --initrd=<initrd-for-second-kernel>.
 
 5) System reboots into the second kernel when a panic occurs. A module can be
    written to force the panic or "ALT-SysRq-c" can be used initiate a crash

trunk/Documentation/kernel-parameters.txt

@@ -164,15 +164,6 @@ running once the system is up.
 			over-ride platform specific driver.
 			See also Documentation/acpi-hotkey.txt.
 
-	enable_timer_pin_1 [i386,x86-64]
-			Enable PIN 1 of APIC timer
-			Can be useful to work around chipset bugs (in particular on some ATI chipsets)
-			The kernel tries to set a reasonable default.
-
-	disable_timer_pin_1 [i386,x86-64]
-			Disable PIN 1 of APIC timer
-			Can be useful to work around chipset bugs.
-
 	ad1816=		[HW,OSS]
 			Format: <io>,<irq>,<dma>,<dma2>
 			See also Documentation/sound/oss/AD1816.

trunk/Documentation/oops-tracing.txt

@@ -205,34 +205,25 @@ Phone: 701-234-7556
 Tainted kernels:
 
 Some oops reports contain the string 'Tainted: ' after the program
-counter. This indicates that the kernel has been tainted by some
-mechanism.  The string is followed by a series of position-sensitive
+counter, this indicates that the kernel has been tainted by some
+mechanism.  The string is followed by a series of position sensitive
 characters, each representing a particular tainted value.
 
   1: 'G' if all modules loaded have a GPL or compatible license, 'P' if
      any proprietary module has been loaded.  Modules without a
      MODULE_LICENSE or with a MODULE_LICENSE that is not recognised by
      insmod as GPL compatible are assumed to be proprietary.
 
-  2: 'F' if any module was force loaded by "insmod -f", ' ' if all
+  2: 'F' if any module was force loaded by insmod -f, ' ' if all
      modules were loaded normally.
 
   3: 'S' if the oops occurred on an SMP kernel running on hardware that
-     hasn't been certified as safe to run multiprocessor.
-     Currently this occurs only on various Athlons that are not
-     SMP capable.
-
-  4: 'R' if a module was force unloaded by "rmmod -f", ' ' if all
-     modules were unloaded normally.
-
-  5: 'M' if any processor has reported a Machine Check Exception,
-     ' ' if no Machine Check Exceptions have occurred.
-
-  6: 'B' if a page-release function has found a bad page reference or
-     some unexpected page flags.
+      hasn't been certified as safe to run multiprocessor.
+	  Currently this occurs only on various Athlons that are not
+	  SMP capable.
 
 The primary reason for the 'Tainted: ' string is to tell kernel
 debuggers if this is a clean kernel or if anything unusual has
-occurred.  Tainting is permanent: even if an offending module is
-unloaded, the tainted value remains to indicate that the kernel is not
+occurred.  Tainting is permanent, even if an offending module is
+unloading the tainted value remains to indicate that the kernel is not
 trustworthy.

trunk/Documentation/pm.txt

@@ -38,12 +38,6 @@ system the associated daemon will exit gracefully.
 
 Driver Interface -- OBSOLETE, DO NOT USE!
 ----------------*************************
-
-Note: pm_register(), pm_access(), pm_dev_idle() and friends are
-obsolete. Please do not use them. Instead you should properly hook
-your driver into the driver model, and use its suspend()/resume()
-callbacks to do this kind of stuff.
-
 If you are writing a new driver or maintaining an old driver, it
 should include power management support.  Without power management
 support, a single driver may prevent a system with power management