[kernel] r6240 - in dists/trunk/linux-2.6: . debian/arch/powerpc debian/arch/powerpc/vserver debian/lib/python/debian_linux debian/patches debian/patches/series

[Bastian Blank]

Author: waldi
Date: Mon Mar 20 15:42:21 2006
New Revision: 6240

Removed:
   dists/trunk/linux-2.6/debian/patches/s390-drivers-subchannel-fix.patch
   dists/trunk/linux-2.6/debian/patches/s390-scripts-modpost-ccw.patch
Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
   dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux-2.6/debian/patches/series/1
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc64	Mon Mar 20 15:42:21 2006
@@ -108,3 +108,4 @@
 # CONFIG_IBMEBUS is not set
 CONFIG_SPU_FS=m
 CONFIG_SPIDER_NET=m
+# CONFIG_LPARCFG is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/vserver/config.powerpc64	Mon Mar 20 15:42:21 2006
@@ -108,3 +108,4 @@
 # CONFIG_IBMEBUS is not set
 CONFIG_SPU_FS=m
 CONFIG_SPIDER_NET=m
+# CONFIG_LPARCFG is not set

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Mon Mar 20 15:42:21 2006
@@ -105,7 +105,7 @@
         extra = {}
         makeflags['ARCH'] = arch
 
-        vars['localversion'] = vars['abiname']
+        vars['localversion'] = ''
 
         self.do_arch_setup(vars, makeflags, arch)
         self.do_arch_makefile(makefile, arch, makeflags)

Modified: dists/trunk/linux-2.6/debian/patches/series/1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1	Mon Mar 20 15:42:21 2006
@@ -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