The patch titled uml: console whitespace and comment tidying has been added to the -mm tree. Its filename is uml-console-whitespace-and-comment-tidying.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: console whitespace and comment tidying From: Jeff Dike <jdike@xxxxxxxxxxx> Some comment and whitespace cleanups in the console and mconsole code. Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/um/drivers/stdio_console.c | 2 -- arch/um/include/mconsole_kern.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff -puN arch/um/drivers/stdio_console.c~uml-console-whitespace-and-comment-tidying arch/um/drivers/stdio_console.c --- a/arch/um/drivers/stdio_console.c~uml-console-whitespace-and-comment-tidying +++ a/arch/um/drivers/stdio_console.c @@ -30,8 +30,6 @@ #define MAX_TTYS (16) -/* ----------------------------------------------------------------------------- */ - /* Referenced only by tty_driver below - presumably it's locked correctly * by the tty driver. */ diff -puN arch/um/include/mconsole_kern.h~uml-console-whitespace-and-comment-tidying arch/um/include/mconsole_kern.h --- a/arch/um/include/mconsole_kern.h~uml-console-whitespace-and-comment-tidying +++ a/arch/um/include/mconsole_kern.h @@ -20,7 +20,7 @@ struct mc_device { char *name; int (*config)(char *, char **); int (*get_config)(char *, char *, int, char **); - int (*id)(char **, int *, int *); + int (*id)(char **, int *, int *); int (*remove)(int, char **); }; _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are x86_64-i386-kernel-mode-faults-pollute-current-thead.patch uml-console-locking-fixes.patch uml-return-hotplug-errors-to-host.patch uml-console-whitespace-and-comment-tidying.patch uml-lock-the-irqs_to_free-list.patch uml-add-locking-to-network-transport-registration.patch uml-network-driver-whitespace-and-style-fixes.patch uml-fix-prototypes.patch rewrite-unnecessary-duplicated-code-to-use-field_sizeof.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html