diff -NurpP --minimal linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/Makefile linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/Makefile
--- linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/Makefile	2005-01-20 01:07:23 +0100
+++ linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/Makefile	2005-01-19 14:32:35 +0100
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 11
-EXTRAVERSION = -rc1-vs1.9.4-rc2-ng8.9
+EXTRAVERSION = -rc1-vs1.9.4-rc2-ng8.10
 NAME=Woozy Numbat
 
 # *DOCUMENTATION*
diff -NurpP --minimal linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/kernel/vserver/helper.c linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/kernel/vserver/helper.c
--- linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/kernel/vserver/helper.c	2005-01-17 18:33:57 +0100
+++ linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/kernel/vserver/helper.c	2005-01-20 13:29:23 +0100
@@ -92,10 +92,10 @@ long vs_reboot(unsigned int cmd, void * 
 long vs_context_state(struct vx_info *vxi, unsigned int cmd)
 {
 	char id_buf[8], cmd_buf[32];
-
 	char *argv[] = {vshelper_path, NULL, id_buf, NULL, 0};
 	char *envp[] = {"HOME=/", "TERM=linux",
 			"PATH=/sbin:/usr/sbin:/bin:/usr/bin", cmd_buf, 0};
+	int ret;
 
 	snprintf(id_buf, sizeof(id_buf)-1, "%d", vxi->vx_id);
 	snprintf(cmd_buf, sizeof(cmd_buf)-1, "VS_CMD=%08x", cmd);
@@ -111,10 +111,10 @@ long vs_context_state(struct vx_info *vx
 		return 0;
 	}
 
-	if (call_usermodehelper(*argv, argv, envp, 1)) {
+	if ((ret = call_usermodehelper(vshelper_path, argv, envp, 1))) {
 		printk( KERN_WARNING
-			"vs_context_state(): failed to exec (%s %s %s %s)\n",
-			vshelper_path, argv[1], argv[2], argv[3]);
+			"vs_context_state(): (%s %s %s %s) returned with %d\n",
+			vshelper_path, argv[1], argv[2], argv[3], ret);
 		return 0;
 	}
 	return 0;
diff -NurpP --minimal linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/net/ipv4/icmp.c linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/net/ipv4/icmp.c
--- linux-2.6.11-rc1-vs1.9.4-rc2-ng8.9/net/ipv4/icmp.c	2005-01-17 18:33:57 +0100
+++ linux-2.6.11-rc1-vs1.9.4-rc2-ng8.10/net/ipv4/icmp.c	2005-01-20 17:50:34 +0100
@@ -404,7 +404,8 @@ static void icmp_reply(struct icmp_bxm *
 					      { .daddr = daddr,
 						.saddr = rt->rt_spec_dst,
 						.tos = RT_TOS(skb->nh.iph->tos) } },
-				    .proto = IPPROTO_ICMP };
+				    .proto = IPPROTO_ICMP,
+				    .nfxid = skb->nfxid, };
 		if (ip_route_output_key(&rt, &fl))
 			goto out_unlock;
 	}