The patch titled fix oddball boolean logic in s390 netiucv has been added to the -mm tree. Its filename is fix-oddball-boolean-logic-in-s390-netiucv.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fix oddball boolean logic in s390 netiucv From: Dave Jones <davej@xxxxxxxxxx> Signed-off-by: Dave Jones <davej@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Andreas Herrmann <aherrman@xxxxxxxxxx> Cc: Michael Holzheu <holzheu@xxxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/s390/net/netiucv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/s390/net/netiucv.c~fix-oddball-boolean-logic-in-s390-netiucv drivers/s390/net/netiucv.c --- a/drivers/s390/net/netiucv.c~fix-oddball-boolean-logic-in-s390-netiucv +++ a/drivers/s390/net/netiucv.c @@ -2029,7 +2029,7 @@ remove_write (struct device_driver *drv, count = IFNAMSIZ-1; for (i=0, p=(char *)buf; i<count && *p; i++, p++) { - if ((*p == '\n') | (*p == ' ')) { + if ((*p == '\n') || (*p == ' ')) { /* trailing lf, grr */ break; } else { _ Patches currently in -mm which might be from davej@xxxxxxxxxx are origin.patch git-acpi.patch git-agpgart.patch git-block.patch git-cpufreq.patch fix-up-funky-logic-in-dvb.patch stv680-boolean-logic-bug.patch remove-silly-messages-from-input-layer.patch fix-oddball-boolean-logic-in-s390-netiucv.patch fix-ide-locking-error.patch post-halloween-doc.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