From: Cornelia Huck Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton --- drivers/s390/cio/airq.c | 4 ++-- drivers/s390/cio/blacklist.c | 4 ++-- drivers/s390/cio/ccwgroup.c | 4 ++-- drivers/s390/cio/chsc.c | 4 ++-- drivers/s390/cio/cio.c | 4 ++-- drivers/s390/cio/css.c | 4 ++-- drivers/s390/cio/device.c | 4 ++-- drivers/s390/cio/device_fsm.c | 2 +- drivers/s390/cio/device_id.c | 2 +- drivers/s390/cio/device_ops.c | 4 ++-- drivers/s390/cio/device_pgid.c | 2 +- drivers/s390/cio/device_status.c | 2 +- drivers/s390/cio/qdio.c | 4 ++-- drivers/s390/net/ctcmain.c | 8 ++++---- drivers/s390/net/cu3088.c | 4 ++-- drivers/s390/net/netiucv.c | 9 +++++---- drivers/s390/s390_rdev.c | 4 ++-- include/asm-s390/s390_rdev.h | 2 +- 18 files changed, 36 insertions(+), 35 deletions(-) diff -puN drivers/s390/cio/airq.c~s390-email-address-change drivers/s390/cio/airq.c --- 25/drivers/s390/cio/airq.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/airq.c Thu Jan 12 17:02:48 2006 @@ -2,12 +2,12 @@ * drivers/s390/cio/airq.c * S/390 common I/O routines -- support for adapter interruptions * - * $Revision: 1.12 $ + * $Revision: 1.15 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Ingo Adlung (adlung@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) * Arnd Bergmann (arndb@de.ibm.com) */ diff -puN drivers/s390/cio/blacklist.c~s390-email-address-change drivers/s390/cio/blacklist.c --- 25/drivers/s390/cio/blacklist.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/blacklist.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/blacklist.c * S/390 common I/O routines -- blacklisting of specific devices - * $Revision: 1.39 $ + * $Revision: 1.42 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Ingo Adlung (adlung@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) * Arnd Bergmann (arndb@de.ibm.com) */ diff -puN drivers/s390/cio/ccwgroup.c~s390-email-address-change drivers/s390/cio/ccwgroup.c --- 25/drivers/s390/cio/ccwgroup.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/ccwgroup.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/ccwgroup.c * bus driver for ccwgroup - * $Revision: 1.33 $ + * $Revision: 1.35 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Arnd Bergmann (arndb@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) */ #include #include diff -puN drivers/s390/cio/chsc.c~s390-email-address-change drivers/s390/cio/chsc.c --- 25/drivers/s390/cio/chsc.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/chsc.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/chsc.c * S/390 common I/O routines -- channel subsystem call - * $Revision: 1.126 $ + * $Revision: 1.128 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Ingo Adlung (adlung@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) * Arnd Bergmann (arndb@de.ibm.com) */ diff -puN drivers/s390/cio/cio.c~s390-email-address-change drivers/s390/cio/cio.c --- 25/drivers/s390/cio/cio.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/cio.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/cio.c * S/390 common I/O routines -- low level i/o calls - * $Revision: 1.138 $ + * $Revision: 1.140 $ * * Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Ingo Adlung (adlung@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) * Arnd Bergmann (arndb@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) */ diff -puN drivers/s390/cio/css.c~s390-email-address-change drivers/s390/cio/css.c --- 25/drivers/s390/cio/css.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/css.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/css.c * driver for channel subsystem - * $Revision: 1.93 $ + * $Revision: 1.96 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Arnd Bergmann (arndb@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) */ #include #include diff -puN drivers/s390/cio/device.c~s390-email-address-change drivers/s390/cio/device.c --- 25/drivers/s390/cio/device.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/device.c * bus driver for ccw devices - * $Revision: 1.137 $ + * $Revision: 1.140 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Arnd Bergmann (arndb@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) */ #include diff -puN drivers/s390/cio/device_fsm.c~s390-email-address-change drivers/s390/cio/device_fsm.c --- 25/drivers/s390/cio/device_fsm.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device_fsm.c Thu Jan 12 17:02:48 2006 @@ -4,7 +4,7 @@ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation - * Author(s): Cornelia Huck(cohuck@de.ibm.com) + * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) */ diff -puN drivers/s390/cio/device_id.c~s390-email-address-change drivers/s390/cio/device_id.c --- 25/drivers/s390/cio/device_id.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device_id.c Thu Jan 12 17:02:48 2006 @@ -3,7 +3,7 @@ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation - * Author(s): Cornelia Huck(cohuck@de.ibm.com) + * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) * * Sense ID functions. diff -puN drivers/s390/cio/device_ops.c~s390-email-address-change drivers/s390/cio/device_ops.c --- 25/drivers/s390/cio/device_ops.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device_ops.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,12 @@ /* * drivers/s390/cio/device_ops.c * - * $Revision: 1.58 $ + * $Revision: 1.61 $ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com) - * Cornelia Huck (cohuck@de.ibm.com) + * Cornelia Huck (cornelia.huck@de.ibm.com) */ #include #include diff -puN drivers/s390/cio/device_pgid.c~s390-email-address-change drivers/s390/cio/device_pgid.c --- 25/drivers/s390/cio/device_pgid.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device_pgid.c Thu Jan 12 17:02:48 2006 @@ -3,7 +3,7 @@ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation - * Author(s): Cornelia Huck(cohuck@de.ibm.com) + * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) * * Path Group ID functions. diff -puN drivers/s390/cio/device_status.c~s390-email-address-change drivers/s390/cio/device_status.c --- 25/drivers/s390/cio/device_status.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/device_status.c Thu Jan 12 17:02:48 2006 @@ -3,7 +3,7 @@ * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, * IBM Corporation - * Author(s): Cornelia Huck(cohuck@de.ibm.com) + * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com) * * Status accumulation and basic sense functions. diff -puN drivers/s390/cio/qdio.c~s390-email-address-change drivers/s390/cio/qdio.c --- 25/drivers/s390/cio/qdio.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/cio/qdio.c Thu Jan 12 17:02:48 2006 @@ -7,7 +7,7 @@ * * Copyright 2000,2002 IBM Corporation * Author(s): Utz Bacher - * 2.6 cio integration by Cornelia Huck + * 2.6 cio integration by Cornelia Huck * * Restriction: only 63 iqdio subchannels would have its own indicator, * after that, subsequent subchannels share one indicator @@ -56,7 +56,7 @@ #include "ioasm.h" #include "chsc.h" -#define VERSION_QDIO_C "$Revision: 1.114 $" +#define VERSION_QDIO_C "$Revision: 1.117 $" /****************** MODULE PARAMETER VARIABLES ********************/ MODULE_AUTHOR("Utz Bacher "); diff -puN drivers/s390/net/ctcmain.c~s390-email-address-change drivers/s390/net/ctcmain.c --- 25/drivers/s390/net/ctcmain.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/net/ctcmain.c Thu Jan 12 17:02:48 2006 @@ -1,5 +1,5 @@ /* - * $Id: ctcmain.c,v 1.78 2005/09/07 12:18:02 pavlic Exp $ + * $Id: ctcmain.c,v 1.79 2006/01/11 11:32:18 cohuck Exp $ * * CTC / ESCON network driver * @@ -8,7 +8,7 @@ * Fixes by : Jochen Röhrig (roehrig@de.ibm.com) * Arnaldo Carvalho de Melo Peter Tiedemann (ptiedem@de.ibm.com) - * Driver Model stuff by : Cornelia Huck + * Driver Model stuff by : Cornelia Huck * * Documentation used: * - Principles of Operation (IBM doc#: SA22-7201-06) @@ -37,7 +37,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.78 $ + * RELEASE-TAG: CTC/ESCON network driver $Revision: 1.79 $ * */ #undef DEBUG @@ -248,7 +248,7 @@ static void print_banner(void) { static int printed = 0; - char vbuf[] = "$Revision: 1.78 $"; + char vbuf[] = "$Revision: 1.79 $"; char *version = vbuf; if (printed) diff -puN drivers/s390/net/cu3088.c~s390-email-address-change drivers/s390/net/cu3088.c --- 25/drivers/s390/net/cu3088.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/net/cu3088.c Thu Jan 12 17:02:48 2006 @@ -1,11 +1,11 @@ /* - * $Id: cu3088.c,v 1.36 2005/10/25 14:37:17 cohuck Exp $ + * $Id: cu3088.c,v 1.38 2006/01/12 14:33:09 cohuck Exp $ * * CTC / LCS ccw_device driver * * Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Arnd Bergmann - * Cornelia Huck + * Cornelia Huck * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -puN drivers/s390/net/netiucv.c~s390-email-address-change drivers/s390/net/netiucv.c --- 25/drivers/s390/net/netiucv.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/net/netiucv.c Thu Jan 12 17:02:48 2006 @@ -1,12 +1,13 @@ /* - * $Id: netiucv.c,v 1.66 2005/05/11 08:10:17 holzheu Exp $ + * $Id: netiucv.c,v 1.69 2006/01/12 14:33:09 cohuck Exp $ * * IUCV network driver * * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) * - * Driverfs integration and all bugs therein by Cornelia Huck(cohuck@de.ibm.com) + * Sysfs integration and all bugs therein by Cornelia Huck + * (cornelia.huck@de.ibm.com) * * Documentation used: * the source of the original IUCV driver by: @@ -30,7 +31,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * RELEASE-TAG: IUCV network driver $Revision: 1.66 $ + * RELEASE-TAG: IUCV network driver $Revision: 1.69 $ * */ @@ -2076,7 +2077,7 @@ DRIVER_ATTR(remove, 0200, NULL, remove_w static void netiucv_banner(void) { - char vbuf[] = "$Revision: 1.66 $"; + char vbuf[] = "$Revision: 1.69 $"; char *version = vbuf; if ((version = strchr(version, ':'))) { diff -puN drivers/s390/s390_rdev.c~s390-email-address-change drivers/s390/s390_rdev.c --- 25/drivers/s390/s390_rdev.c~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/drivers/s390/s390_rdev.c Thu Jan 12 17:02:48 2006 @@ -1,11 +1,11 @@ /* * drivers/s390/s390_rdev.c * s390 root device - * $Revision: 1.2 $ + * $Revision: 1.4 $ * * Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH, * IBM Corporation - * Author(s): Cornelia Huck (cohuck@de.ibm.com) + * Author(s): Cornelia Huck (cornelia.huck@de.ibm.com) * Carsten Otte (cotte@de.ibm.com) */ diff -puN include/asm-s390/s390_rdev.h~s390-email-address-change include/asm-s390/s390_rdev.h --- 25/include/asm-s390/s390_rdev.h~s390-email-address-change Thu Jan 12 17:02:48 2006 +++ 25-akpm/include/asm-s390/s390_rdev.h Thu Jan 12 17:02:48 2006 @@ -2,7 +2,7 @@ * include/asm-s390/ccwdev.h * * Copyright (C) 2002,2005 IBM Deutschland Entwicklung GmbH, IBM Corporation - * Author(s): Cornelia Huck + * Author(s): Cornelia Huck * Carsten Otte * * Interface for s390 root device _