Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=6240

debian/arch/powerpc/config.powerpc64

@@ -108,3 +108,4 @@ CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_IBMEBUS is not set
 CONFIG_SPU_FS=m
 CONFIG_SPIDER_NET=m
+# CONFIG_LPARCFG is not set

debian/arch/powerpc/vserver/config.powerpc64

@@ -108,3 +108,4 @@ CONFIG_KERNEL_START=0xc000000000000000
 # CONFIG_IBMEBUS is not set
 CONFIG_SPU_FS=m
 CONFIG_SPIDER_NET=m
+# CONFIG_LPARCFG is not set

debian/lib/python/debian_linux/gencontrol.py

@@ -105,7 +105,7 @@ class gencontrol(object):
         extra = {}
         makeflags['ARCH'] = arch
 
-        vars['localversion'] = vars['abiname']
+        vars['localversion'] = ''
 
         self.do_arch_setup(vars, makeflags, arch)
         self.do_arch_makefile(makefile, arch, makeflags)

debian/patches/s390-drivers-subchannel-fix.patch

@@ -1,14 +0,0 @@
-diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
-index 1bbf231..3c77d65 100644
---- a/drivers/s390/cio/css.c
-+++ b/drivers/s390/cio/css.c
-@@ -409,6 +409,9 @@ __init_channel_subsystem(struct subchann
- 		/* -ENXIO: no more subchannels. */
- 		case -ENXIO:
- 			return ret;
-+		/* -EIO: this subchannel set not supported. */
-+		case -EIO:
-+			return ret;
- 		default:
- 			return 0;
- 		}

debian/patches/s390-scripts-modpost-ccw.patch

@@ -1,15 +0,0 @@
-## Upstream status: Commited as de1d9c033f32ce39bf60e25be3b8624225fa9181
-
-diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index be97caf..c164b23 100644
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -246,7 +246,7 @@ static int do_ccw_entry(const char *file
- 	    id->cu_model);
- 	ADD(alias, "dt", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
- 	    id->dev_type);
--	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_TYPE,
-+	ADD(alias, "dm", id->match_flags&CCW_DEVICE_ID_MATCH_DEVICE_MODEL,
- 	    id->dev_model);
- 	return 1;
- }

debian/patches/series/1

@@ -25,4 +25,3 @@
 + video-vino-64-bit-fix-kernel.diff
 + s390-drivers-ccw-uevent-modalias.patch
 + s390-drivers-ccw-uevent-cleanup.patch
-#FIXME + s390-drivers-subchannel-fix.patch