diff -urN oldtree/drivers/ata/libata-scsi.c newtree/drivers/ata/libata-scsi.c
--- oldtree/drivers/ata/libata-scsi.c	2006-09-27 18:39:44.000000000 -0400
+++ newtree/drivers/ata/libata-scsi.c	2006-09-27 19:04:06.000000000 -0400
@@ -177,7 +177,7 @@
 
 	sensebuf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_NOIO);
 	if (!sensebuf)
-		return -ENOMEN;
+		return -ENOMEM;
 
 	memset(scsi_cmd, 0, sizeof(scsi_cmd));
 
diff -urN oldtree/drivers/ide/ide-disk.c newtree/drivers/ide/ide-disk.c
--- oldtree/drivers/ide/ide-disk.c	2006-09-27 18:39:44.000000000 -0400
+++ newtree/drivers/ide/ide-disk.c	2006-09-27 19:23:05.000000000 -0400
@@ -743,7 +743,7 @@
  */
 void ide_end_protect_rq(struct request *rq, int error)
 {
-	struct completion *waiting = rq->waiting;
+	struct completion *waiting = rq->end_io_data;
 
 	/* spin lock already accquired */
 	if (!blk_queue_stopped(rq->q))
@@ -781,7 +781,7 @@
 		memset(args, 0, sizeof(args));
 		argbuf[0] = 0xe5; /* CHECK_POWER_MODE1 */
 		ide_init_drive_cmd(&rq);
-		rq.flags = REQ_DRIVE_TASK;
+                rq.cmd_type = REQ_TYPE_ATA_TASK;
 		rq.buffer = argbuf;
 		rc = ide_do_drive_cmd(drive, &rq, ide_head_wait);
 	}
@@ -815,14 +815,14 @@
 	/* Issue the park command & freeze */
 	ide_init_drive_cmd(&rq);
 
-	rq.flags = REQ_DRIVE_TASK;
+	rq.cmd_type = REQ_TYPE_ATA_TASK;
 	rq.buffer = argbuf;
-	rq.waiting = &wait;
+	rq.end_io_data = &wait;
 	rq.end_io = ide_end_protect_rq;
 
 	ret = ide_do_drive_cmd(drive, &rq, ide_next);
 	wait_for_completion(&wait);
-	rq.waiting = NULL;
+	rq.end_io_data = NULL;
 
 	if (ret)
 	{
@@ -1139,8 +1139,8 @@
 
 	write_cache(drive, 1);
 
-	blk_queue_issue_protect_fn(drive->queue, idedisk_issue_protect_fn);
-	blk_queue_issue_unprotect_fn(drive->queue, idedisk_issue_unprotect_fn);
+	blk_queue_issue_protect_fn(drive->queue, idedisk_issue_protect_fn);	
+	blk_queue_issue_unprotect_fn(drive->queue, idedisk_issue_unprotect_fn);	
 }
 
 static void ide_cacheflush_p(ide_drive_t *drive)
diff -urN oldtree/drivers/scsi/scsi_lib.c newtree/drivers/scsi/scsi_lib.c
--- oldtree/drivers/scsi/scsi_lib.c	2006-09-27 18:39:44.000000000 -0400
+++ newtree/drivers/scsi/scsi_lib.c	2006-09-27 19:38:32.000000000 -0400
@@ -2289,10 +2289,10 @@
  */
 static void scsi_protect_wait_done(struct request *req, int uptodate)
 {
-	struct completion *waiting = req->waiting;
+	struct completion *waiting = req->end_io_data;
 	struct scsi_device *sdev = req->q->queuedata;
 
-	req->waiting = NULL;
+	req->end_io_data = NULL;
 	__blk_put_request(req->q, req);
 	scsi_internal_device_block(sdev);
 
@@ -2336,7 +2336,7 @@
 	req = blk_get_request(sdev->request_queue, write, gfp);
 	if (!req)
 		return ret;
-	req->flags |= REQ_BLOCK_PC | REQ_QUIET;
+	req->cmd_flags |= REQ_TYPE_BLOCK_PC | REQ_QUIET;
 
 	if (bufflen && blk_rq_map_kern(req->q, req, buffer, bufflen, gfp))
 		goto free_req;
@@ -2354,10 +2354,10 @@
 	 */
 	req->ref_count++;
 
-	req->waiting = &wait;
+	req->end_io_data = &wait;
 	blk_execute_rq_nowait(req->q, NULL, req, 1, done);
 	wait_for_completion(&wait);
-	req->waiting = NULL;
+	req->end_io_data = NULL;
 
 	ret = req->errors;
 free_req:
diff -urN oldtree/fs/squashfs/inode.c newtree/fs/squashfs/inode.c
--- oldtree/fs/squashfs/inode.c	2006-09-27 14:59:50.000000000 -0400
+++ newtree/fs/squashfs/inode.c	2006-09-27 18:57:10.000000000 -0400
@@ -2141,12 +2141,9 @@
 
 static void destroy_inodecache(void)
 {
-	if (kmem_cache_destroy(squashfs_inode_cachep))
-		printk(KERN_INFO "squashfs_inode_cache: not all structures "
-			"were freed\n");
+        kmem_cache_destroy(squashfs_inode_cachep);
 }
 
-
 module_init(init_squashfs_fs);
 module_exit(exit_squashfs_fs);
 MODULE_DESCRIPTION("squashfs 3.1, a compressed read-only filesystem");
diff -urN oldtree/mm/filemap.c newtree/mm/filemap.c
--- oldtree/mm/filemap.c	2006-09-26 15:48:32.000000000 -0400
+++ newtree/mm/filemap.c	2006-09-28 16:17:33.000000000 -0400
@@ -988,8 +988,8 @@
  */
 static int large_isize(unsigned long nr_pages)
 {
-	if (nr_pages * 6 > total_pages) {
-		 unsigned long unmapped_ram = total_pages - nr_mapped();
+	if (nr_pages * 6 > vm_total_pages) {
+		 unsigned long unmapped_ram = vm_total_pages - nr_mapped();
 
 		if (nr_pages * 2 > unmapped_ram)
 			return 1;
diff -urN oldtree/mm/page_alloc.c newtree/mm/page_alloc.c
--- oldtree/mm/page_alloc.c	2006-09-26 18:39:54.000000000 -0400
+++ newtree/mm/page_alloc.c	2006-09-27 18:49:30.000000000 -0400
@@ -3287,14 +3287,9 @@
 	BUG_ON(!mem_map);
 	printk (KERN_INFO "PAGE_OFFSET=0x%08lx\n", PAGE_OFFSET);
 	printk (KERN_INFO "BadRAM option is %s\n", str);
-	if (*str++ == '=')
-		while ((str = get_longoptions (str, 3, (int *) opts), *opts)) {
-			printk (KERN_INFO "   --> marking 0x%08lx, 0x%08lx  [%ld]\n",
-					opts[1], opts[2], opts[0]);
-			badram_markpages (*opts, opts+1);
+	if (*str++ == '=') 
+		badram_markpages (*opts, opts+1);
 			if (*opts == 1)
-				break;
-		};
 	badram_markpages (*badram_custom, badram_custom+1);
 	return 0;
 }
Files oldtree/scripts/kconfig/mconf and newtree/scripts/kconfig/mconf differ
diff -urN oldtree/sound/oss/trident.c newtree/sound/oss/trident.c
--- oldtree/sound/oss/trident.c	2006-09-26 19:05:09.000000000 -0400
+++ newtree/sound/oss/trident.c	2006-09-27 19:44:53.000000000 -0400
@@ -4123,7 +4123,7 @@
 	pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff);
 	udelay(5000);
 	
-	pci_dev_put(pdev);
+	pci_dev_put(pci_dev);
 	
 
 	pci_dev = card->pci_dev;