diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/Makefile DEVEL/linux-2.4.21-vs1.1.5/Makefile
--- DEVEL/linux-2.4.21-vs1.1.4/Makefile	Mon Dec  1 16:17:58 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/Makefile	Mon Dec  1 16:18:06 2003
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 21
-EXTRAVERSION = -vs1.1.4
+EXTRAVERSION = -vs1.1.5
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/drivers/block/vroot.c DEVEL/linux-2.4.21-vs1.1.5/drivers/block/vroot.c
--- DEVEL/linux-2.4.21-vs1.1.4/drivers/block/vroot.c	Mon Dec  1 16:17:59 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/drivers/block/vroot.c	Mon Dec  1 16:18:08 2003
@@ -261,8 +261,8 @@ int __init vroot_init(void)
 
 	if ((max_vroot < 1) || (max_vroot > 256)) {
 		printk(KERN_WARNING "vroot: invalid max_vroot (must be between"
-				    " 1 and 256), using default ("
-				    ##MAX_VROOT_DEFAULT ")\n");
+				    " 1 and 256), using default (%d)\n",
+				    MAX_VROOT_DEFAULT);
 		max_vroot = MAX_VROOT_DEFAULT;
 	}
 
diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/fs/proc/array.c DEVEL/linux-2.4.21-vs1.1.5/fs/proc/array.c
--- DEVEL/linux-2.4.21-vs1.1.4/fs/proc/array.c	Mon Dec  1 16:17:58 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/fs/proc/array.c	Mon Dec  1 16:18:07 2003
@@ -304,8 +304,10 @@ int proc_pid_status(struct task_struct *
 
 		buffer += sprintf (buffer,"s_context: %d [", task->vx_id);
 		for (i=0; i<NB_S_CONTEXT; i++) {
-			short int ctx = task->s_info->vx_id[i];
-			if (ctx == 0) break;
+			int ctx = task->s_info->vx_id[i];
+
+			if (ctx == 0)
+				break;
 			buffer += sprintf (buffer," %d",ctx);
 		}
 		*buffer++ = ']';
diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/kernel/info.c DEVEL/linux-2.4.21-vs1.1.5/kernel/info.c
--- DEVEL/linux-2.4.21-vs1.1.4/kernel/info.c	Mon Dec  1 16:17:59 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/kernel/info.c	Mon Dec  1 16:18:08 2003
@@ -25,6 +25,7 @@ asmlinkage long sys_sysinfo(struct sysin
 		val.procs = nr_threads-1;
 	} else {
 		struct context_info *si = current->s_info;
+
 		val.uptime = (jiffies - si->bias_jiffies) / HZ;
 		val.procs = si->nr_threads;
 	}
diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/kernel/timer.c DEVEL/linux-2.4.21-vs1.1.5/kernel/timer.c
--- DEVEL/linux-2.4.21-vs1.1.4/kernel/timer.c	Mon Dec  1 16:17:59 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/kernel/timer.c	Mon Dec  1 16:18:07 2003
@@ -755,7 +755,8 @@ asmlinkage unsigned long sys_alarm(unsig
  */
 asmlinkage long sys_getpid(void)
 {
-	if (current->s_info && current->s_info->initpid == current->tgid)
+	if (current->s_info &&
+		current->s_info->initpid == current->tgid)
 		/* We are faking process 1 for this security context */
 		return 1;
 	return current->tgid;
diff -NurpP --minimal DEVEL/linux-2.4.21-vs1.1.4/net/ipv4/tcp_ipv4.c DEVEL/linux-2.4.21-vs1.1.5/net/ipv4/tcp_ipv4.c
--- DEVEL/linux-2.4.21-vs1.1.4/net/ipv4/tcp_ipv4.c	Mon Dec  1 16:17:59 2003
+++ DEVEL/linux-2.4.21-vs1.1.5/net/ipv4/tcp_ipv4.c	Mon Dec  1 16:18:08 2003
@@ -2332,7 +2332,7 @@ skip_listen:
 		     tw != NULL;
 		     tw = (struct tcp_tw_bucket *)tw->next, num++) {
 			if (!TCP_INET_FAMILY(tw->family) ||
-				!vx_check(sk->vx_id, VX_WATCH|VX_IDENT))
+				!vx_check(tw->vx_id, VX_WATCH|VX_IDENT))
 				continue;
 			pos += TMPSZ;
 			if (pos <= offset)