From 87dbbda490a75832606cb7bfeaaaa18970bb7fac Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 20 Mar 2006 15:42:21 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6. svn path=/dists/trunk/linux-2.6/; revision=6240 --- debian/arch/powerpc/config.powerpc64 | 1 + debian/arch/powerpc/vserver/config.powerpc64 | 1 + debian/lib/python/debian_linux/gencontrol.py | 2 +- debian/patches/s390-drivers-subchannel-fix.patch | 14 -------------- debian/patches/s390-scripts-modpost-ccw.patch | 15 --------------- debian/patches/series/1 | 1 - 6 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 debian/patches/s390-drivers-subchannel-fix.patch delete mode 100644 debian/patches/s390-scripts-modpost-ccw.patch diff --git a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64 index 01287d0fa21a..c2b408e643f1 100644 --- a/debian/arch/powerpc/config.powerpc64 +++ b/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 diff --git a/debian/arch/powerpc/vserver/config.powerpc64 b/debian/arch/powerpc/vserver/config.powerpc64 index 01287d0fa21a..c2b408e643f1 100644 --- a/debian/arch/powerpc/vserver/config.powerpc64 +++ b/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 diff --git a/debian/lib/python/debian_linux/gencontrol.py b/debian/lib/python/debian_linux/gencontrol.py index cd146f282ee5..c36af6eea0de 100644 --- a/debian/lib/python/debian_linux/gencontrol.py +++ b/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) diff --git a/debian/patches/s390-drivers-subchannel-fix.patch b/debian/patches/s390-drivers-subchannel-fix.patch deleted file mode 100644 index 14c574076bde..000000000000 --- a/debian/patches/s390-drivers-subchannel-fix.patch +++ /dev/null @@ -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; - } diff --git a/debian/patches/s390-scripts-modpost-ccw.patch b/debian/patches/s390-scripts-modpost-ccw.patch deleted file mode 100644 index c0e12bd2693a..000000000000 --- a/debian/patches/s390-scripts-modpost-ccw.patch +++ /dev/null @@ -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; - } diff --git a/debian/patches/series/1 b/debian/patches/series/1 index d6dbcc434e13..1d0bde7eeea9 100644 --- a/debian/patches/series/1 +++ b/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