- uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments.patch removed from -mm tree

- uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments.patch removed from -mm tree

[akpm]

The patch titled
     uml: user of helper_wait() got missed when it got extra arguments
has been removed from the -mm tree.  Its filename was
     uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: uml: user of helper_wait() got missed when it got extra arguments
From: Al Viro <viro@ftp.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/um/drivers/harddog_user.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/um/drivers/harddog_user.c~uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments arch/um/drivers/harddog_user.c
--- a/arch/um/drivers/harddog_user.c~uml-user-of-helper_wait-got-missed-when-it-got-extra-arguments
+++ a/arch/um/drivers/harddog_user.c
@@ -79,14 +79,14 @@ int start_watchdog(int *in_fd_ret, int *
 	n = read(in_fds[0], &c, sizeof(c));
 	if (n == 0) {
 		printk("harddog_open - EOF on watchdog pipe\n");
-		helper_wait(pid);
+		helper_wait(pid, 1, NULL);
 		err = -EIO;
 		goto out_close_out;
 	}
 	else if (n < 0) {
 		printk("harddog_open - read of watchdog pipe failed, "
 		       "err = %d\n", errno);
-		helper_wait(pid);
+		helper_wait(pid, 1, NULL);
 		err = n;
 		goto out_close_out;
 	}
_

Patches currently in -mm which might be from viro@ftp.linux.org.uk are

sdio-fix-module-device-table-definition-for-m68k.patch
git-netdev-all.patch
slab-leaks3-default-y.patch