--- linux-2.6.19.3-vs2.2.0-rc12.2/arch/parisc/kernel/sys_parisc32.c	2006-11-08 04:57:44 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/arch/parisc/kernel/sys_parisc32.c	2007-02-14 23:12:22 +0100
@@ -612,7 +612,7 @@ asmlinkage int sys32_sysinfo(struct sysi
 
 	do {
 		seq = read_seqbegin(&xtime_lock);
-		/* FIXME: requires vx virtualization */
+		/* TODO: requires vx virtualization */
 		val.uptime = jiffies / HZ;
 
 		val.loads[0] = avenrun[0] << (SI_LOAD_SHIFT - FSHIFT);
--- linux-2.6.19.3-vs2.2.0-rc12.2/fs/namei.c	2007-02-06 16:39:44 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/fs/namei.c	2007-02-14 21:52:13 +0100
@@ -770,7 +770,7 @@ static __always_inline void follow_dotdo
 		if (nd->dentry == fs->root &&
 		    nd->mnt == fs->rootmnt) {
                         read_unlock(&fs->lock);
-			/* FIXME: for sane '/' avoid follow_mount() */
+			/* for sane '/' avoid follow_mount() */
 			return;
 		}
                 read_unlock(&fs->lock);
--- linux-2.6.19.3-vs2.2.0-rc12.2/fs/proc/base.c	2006-12-04 06:53:21 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/fs/proc/base.c	2007-02-14 23:12:14 +0100
@@ -1415,7 +1415,7 @@ static struct dentry *proc_pident_lookup
 	if (!task)
 		goto out_no_task;
 
-	/* FIXME: maybe we can come up with a generic approach? */
+	/* TODO: maybe we can come up with a generic approach? */
 	if (task_vx_flags(task, VXF_HIDE_VINFO, 0) &&
 		(dentry->d_name.len == 5) &&
 		(!memcmp(dentry->d_name.name, "vinfo", 5) ||
--- linux-2.6.19.3-vs2.2.0-rc12.2/fs/xfs/xfs_vnodeops.c	2006-12-06 05:50:27 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/fs/xfs/xfs_vnodeops.c	2007-02-14 23:14:26 +0100
@@ -318,7 +318,7 @@ xfs_setattr(
 	    (mask & (XFS_AT_UID|XFS_AT_GID|XFS_AT_PROJID))) {
 		uint	qflags = 0;
 
-		/* FIXME: handle tagging? */
+		/* TODO: handle tagging? */
 		if ((mask & XFS_AT_UID) && XFS_IS_UQUOTA_ON(mp)) {
 			uid = vap->va_uid;
 			qflags |= XFS_QMOPT_UQUOTA;
@@ -398,7 +398,7 @@ xfs_setattr(
 	if (mask &
 	    (XFS_AT_MODE|XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_UID|
 	     XFS_AT_GID|XFS_AT_PROJID)) {
-		/* FIXME: handle tagging? */
+		/* TODO: handle tagging? */
 
 		/*
 		 * CAP_FOWNER overrides the following restrictions:
@@ -489,7 +489,7 @@ xfs_setattr(
 		if ((XFS_IS_UQUOTA_ON(mp) && iuid != uid) ||
 		    (XFS_IS_PQUOTA_ON(mp) && iprojid != projid) ||
 		    (XFS_IS_GQUOTA_ON(mp) && igid != gid)) {
-			/* FIXME: handle tagging? */
+			/* TODO: handle tagging? */
 			ASSERT(tp);
 			code = XFS_QM_DQVOPCHOWNRESV(mp, tp, ip, udqp, gdqp,
 						capable(CAP_FOWNER) ?
--- linux-2.6.19.3-vs2.2.0-rc12.2/kernel/fork.c	2007-01-30 04:40:30 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/kernel/fork.c	2007-02-14 23:14:51 +0100
@@ -712,7 +712,7 @@ static struct files_struct *dup_fd(struc
 		struct file *f = *old_fds++;
 		if (f) {
 			get_file(f);
-			/* FIXME: sum it first for check and performance */
+			/* TODO: sum it first for check and performance */
 			vx_openfd_inc(open_files - i);
 		} else {
 			/*
--- linux-2.6.19.3-vs2.2.0-rc12.2/net/ipv4/udp.c	2007-02-14 04:52:53 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/net/ipv4/udp.c	2007-02-14 23:00:04 +0100
@@ -199,8 +199,6 @@ gotit:
 			    (!sk2->sk_reuse        || !sk->sk_reuse)         &&
 			    (!sk2->sk_bound_dev_if || !sk->sk_bound_dev_if
 			     || sk2->sk_bound_dev_if == sk->sk_bound_dev_if) &&
-				/* FIXME: nx_addr_conflict(sk->sk_nx_info,
-					inet_rcv_saddr(sk), sk2) &&	*/
 			    (*saddr_cmp)(sk, sk2)                              )
 				goto fail;
 	}
--- linux-2.6.19.3-vs2.2.0-rc12.2/net/sunrpc/clnt.c	2007-02-06 02:34:11 +0100
+++ linux-2.6.19.3-vs2.2.0-rc12.3.1/net/sunrpc/clnt.c	2007-02-14 23:01:26 +0100
@@ -240,7 +240,7 @@ struct rpc_clnt *rpc_create(struct rpc_c
 		clnt->cl_autobind = 1;
 	if (args->flags & RPC_CLNT_CREATE_ONESHOT)
 		clnt->cl_oneshot = 1;
-	/* FIXME: handle RPC_CLNT_CREATE_TAGGED
+	/* TODO: handle RPC_CLNT_CREATE_TAGGED
 	if (args->flags & RPC_CLNT_CREATE_TAGGED)
 		clnt->cl_tag = 1; */
 	return clnt;