## Automatically generated incremental diff
## From:   linux-2.4.29-rc3
## To:     linux-2.4.29-rc4
## Robot:  $Id: make-incremental-diff,v 1.12 2004/01/06 07:19:36 hpa Exp $

diff -urN linux-2.4.29-rc3/Makefile linux-2.4.29-rc4/Makefile
--- linux-2.4.29-rc3/Makefile	2005-01-19 05:46:26.650501265 -0800
+++ linux-2.4.29-rc4/Makefile	2005-01-19 05:46:55.799753534 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 29
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc4
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.29-rc3/arch/i386/defconfig linux-2.4.29-rc4/arch/i386/defconfig
--- linux-2.4.29-rc3/arch/i386/defconfig	2004-11-17 03:54:21.000000000 -0800
+++ linux-2.4.29-rc4/arch/i386/defconfig	2005-01-19 05:46:55.980761310 -0800
@@ -200,11 +200,6 @@
 #
 # CONFIG_IPX is not set
 # CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
 # CONFIG_DECNET is not set
 # CONFIG_BRIDGE is not set
 
@@ -240,10 +235,12 @@
 #
 # CONFIG_BLK_DEV_HD_IDE is not set
 # CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_IDEDISK_MULTI_MODE=y
 # CONFIG_IDEDISK_STROKE is not set
 # CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_DELKIN is not set
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -346,11 +343,15 @@
 # CONFIG_SCSI_MEGARAID is not set
 # CONFIG_SCSI_MEGARAID2 is not set
 # CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_NV is not set
 # CONFIG_SCSI_SATA_PROMISE is not set
 # CONFIG_SCSI_SATA_SX4 is not set
 # CONFIG_SCSI_SATA_SIL is not set
 # CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_ULI is not set
 # CONFIG_SCSI_SATA_VIA is not set
 # CONFIG_SCSI_SATA_VITESSE is not set
 # CONFIG_SCSI_BUSLOGIC is not set
diff -urN linux-2.4.29-rc3/init/do_mounts.c linux-2.4.29-rc4/init/do_mounts.c
--- linux-2.4.29-rc3/init/do_mounts.c	2005-01-19 05:46:42.381177067 -0800
+++ linux-2.4.29-rc4/init/do_mounts.c	2003-11-28 10:26:21.000000000 -0800
@@ -348,7 +348,6 @@
 {
 	char *fs_names = __getname();
 	char *p;
-	int tries = 10;
 
 	get_fs_names(fs_names);
 retry:
@@ -368,18 +367,11 @@
 		 * Allow the user to distinguish between failed open
 		 * and bad superblock on root device.
 		 */
-		if (--tries) {
-			printk ("VFS: Cannot open root device \"%s\" or %s, "
-				"retrying in 1s.\n",
-				root_device_name, kdevname (ROOT_DEV));
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(HZ);
-			goto retry;
-		}
 		printk ("VFS: Cannot open root device \"%s\" or %s\n",
 			root_device_name, kdevname (ROOT_DEV));
 		printk ("Please append a correct \"root=\" boot option\n");
-		break;
+		panic("VFS: Unable to mount root fs on %s",
+			kdevname(ROOT_DEV));
 	}
 	panic("VFS: Unable to mount root fs on %s", kdevname(ROOT_DEV));
 out:
