--- linux-2.6.16-rc4/drivers/mtd/devices/blkmtd.c	2006-01-03 17:29:35 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/drivers/mtd/devices/blkmtd.c	2006-02-17 23:26:32 +0100
@@ -614,7 +614,7 @@ static struct mtd_erase_region_info *cal
 }
 
 
-extern dev_t __init name_to_dev_t(const char *line);
+extern dev_t __init name_to_dev_t(char *line);
 
 static struct blkmtd_dev *add_device(char *devname, int readonly, int erase_size)
 {
--- linux-2.6.16-rc4/fs/inode.c	2006-02-18 14:40:22 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/inode.c	2006-02-17 23:26:32 +0100
@@ -236,6 +242,8 @@ void __iget(struct inode * inode)
 	inodes_stat.nr_unused--;
 }
 
+EXPORT_SYMBOL_GPL(__iget);
+
 /**
  * clear_inode - clear an inode
  * @inode: inode to clear
--- linux-2.6.16-rc4/fs/quota_v1.c	2005-03-02 12:38:45 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/fs/quota_v1.c	2006-02-17 23:26:32 +0100
@@ -123,7 +125,8 @@ *****
 		return 1;	/* Probably not new format */
 	if (le32_to_cpu(dqhead.dqh_magic) != quota_magics[type])
 		return 1;	/* Definitely not new format */
-	printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file. It probably contains newer quota format.\n", sb->s_id);
+	printk(KERN_INFO "VFS: %s: Refusing to turn on old quota format on given file."
+		" It probably contains newer quota format.\n", hash->dqh_sb->s_id);
         return 0;		/* Seems like a new format file -> refuse it */
 }
 
--- linux-2.6.16-rc4/kernel/exit.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/exit.c	2006-02-20 23:19:58 +0100
@@ -533,7 +542,7 @@ static void exit_mm(struct task_struct *
 	mmput(mm);
 }
 
-static inline void choose_new_parent(task_t *p, task_t *reaper, task_t *child_reaper)
+static inline void choose_new_parent(task_t *p, task_t *reaper)
 {
 	/*
 	 * Make sure we're not reparenting to ourselves and that
--- linux-2.6.16-rc4/kernel/exit.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/exit.c	2006-02-20 23:19:58 +0100
@@ -661,7 +695,7 @@ static void forget_original_parent(struc
 	}
 	list_for_each_safe(_p, _n, &father->ptrace_children) {
 		p = list_entry(_p,struct task_struct,ptrace_list);
-		choose_new_parent(p, reaper, child_reaper);
+		choose_new_parent(p, reaper);
 		reparent_thread(p, father, 1);
 	}
 }
--- linux-2.6.16-rc4/kernel/exit.c	2006-02-18 14:40:37 +0100
+++ linux-2.6.16-rc4-vs2.1.1-rc8/kernel/exit.c	2006-02-20 23:19:58 +0100
@@ -640,7 +674,7 @@ static void forget_original_parent(struc
 
 		if (father == p->real_parent) {
 			/* reparent with a reaper, real father it's us */
-			choose_new_parent(p, reaper, child_reaper);
+			choose_new_parent(p, reaper);
 			reparent_thread(p, father, 0);
 		} else {
 			/* reparent ptraced task to its real parent */