[kernel] r4866 - in dists: sid/linux-2.6/debian sid/linux-2.6/debian/arch sid/linux-2.6/debian/arch/alpha sid/linux-2.6/debian/arch/amd64 sid/linux-2.6/debian/arch/i386 sid/linux-2.6/debian/arch/ia64 sid/linux-2.6/debian/arch/powerpc trunk/linux-2.6/debian trunk/linux-2.6/debian/arch trunk/linux-2.6/debian/arch/alpha trunk/linux-2.6/debian/arch/amd64 trunk/linux-2.6/debian/arch/i386 trunk/linux-2.6/debian/arch/ia64 trunk/linux-2.6/debian/arch/powerpc

Simon Horman horms at costa.debian.org
Tue Nov 22 01:48:46 UTC 2005 

Author: horms
Date: Tue Nov 22 01:48:43 2005
New Revision: 4866

Modified:
   dists/sid/linux-2.6/debian/arch/alpha/config.alpha-generic
   dists/sid/linux-2.6/debian/arch/alpha/config.alpha-smp
   dists/sid/linux-2.6/debian/arch/amd64/config.amd64-generic
   dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8
   dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4
   dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
   dists/sid/linux-2.6/debian/arch/config
   dists/sid/linux-2.6/debian/arch/i386/config.386
   dists/sid/linux-2.6/debian/arch/i386/config.686
   dists/sid/linux-2.6/debian/arch/i386/config.686-smp
   dists/sid/linux-2.6/debian/arch/i386/config.k7
   dists/sid/linux-2.6/debian/arch/i386/config.k7-smp
   dists/sid/linux-2.6/debian/arch/ia64/config
   dists/sid/linux-2.6/debian/arch/powerpc/config
   dists/sid/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-generic
   dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
   dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/i386/config.386
   dists/trunk/linux-2.6/debian/arch/i386/config.686
   dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
   dists/trunk/linux-2.6/debian/arch/i386/config.k7
   dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/changelog
Log:
Enable MKISS globally (closes: #340215)

Modified: dists/sid/linux-2.6/debian/arch/alpha/config.alpha-generic
==============================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/config.alpha-generic	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/config.alpha-generic	Tue Nov 22 01:48:43 2005
@@ -4,7 +4,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 CONFIG_DONGLE_OLD=y

Modified: dists/sid/linux-2.6/debian/arch/alpha/config.alpha-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/alpha/config.alpha-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/alpha/config.alpha-smp	Tue Nov 22 01:48:43 2005
@@ -6,5 +6,4 @@
 CONFIG_NR_CPUS=64
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_MATHEMU=y
-CONFIG_MKISS=m
 # CONFIG_DIGIEPCA is not set

Modified: dists/sid/linux-2.6/debian/arch/amd64/config.amd64-generic
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.amd64-generic	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.amd64-generic	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	Tue Nov 22 01:48:43 2005
@@ -30,7 +30,6 @@
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_SPARSEMEM_EXTREME=y
 # CONFIG_SPARSEMEM_MANUAL is not set

Modified: dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	Tue Nov 22 01:48:43 2005
@@ -23,4 +23,3 @@
 CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m

Modified: dists/sid/linux-2.6/debian/arch/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/config	(original)
+++ dists/sid/linux-2.6/debian/arch/config	Tue Nov 22 01:48:43 2005
@@ -703,3 +703,4 @@
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
+CONFIG_MKISS=m

Modified: dists/sid/linux-2.6/debian/arch/i386/config.386
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.386	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.386	Tue Nov 22 01:48:43 2005
@@ -43,7 +43,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/sid/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.686	Tue Nov 22 01:48:43 2005
@@ -34,7 +34,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/sid/linux-2.6/debian/arch/i386/config.686-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.686-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.686-smp	Tue Nov 22 01:48:43 2005
@@ -38,7 +38,6 @@
 # CONFIG_SBPCD is not set
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: dists/sid/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.k7	Tue Nov 22 01:48:43 2005
@@ -35,7 +35,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/sid/linux-2.6/debian/arch/i386/config.k7-smp
==============================================================================
--- dists/sid/linux-2.6/debian/arch/i386/config.k7-smp	(original)
+++ dists/sid/linux-2.6/debian/arch/i386/config.k7-smp	Tue Nov 22 01:48:43 2005
@@ -39,7 +39,6 @@
 # CONFIG_SBPCD is not set
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: dists/sid/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/sid/linux-2.6/debian/arch/ia64/config	Tue Nov 22 01:48:43 2005
@@ -1368,6 +1368,5 @@
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_SYSVIPC_COMPAT=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_MKISS=m
 CONFIG_DIGIEPCA=m
 # CONFIG_CPU_FREQ is not set

Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	Tue Nov 22 01:48:43 2005
@@ -1253,5 +1253,4 @@
 CONFIG_PM_STD_PARTITION=""
 CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_MKISS=m
 CONFIG_I2C_PMAC_SMU=m

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Tue Nov 22 01:48:43 2005
@@ -1,11 +1,15 @@
 linux-2.6 (2.6.14-4) UNRELEASED; urgency=low
 
+  [ dann frazier ]
   * setkeys-needs-root-1.patch, setkeys-needs-root-2.patch:
     [SECURITY] Require root privilege to write the current
     function key string entry of other user's terminals.
     See CVE-2005-3257 (Closes: #334113)
 
- -- dann frazier <dannf at debian.org>  Sun, 20 Nov 2005 00:15:31 -0700
+  [ Simon Horman ]
+  * Enable MKISS globally (closes: #340215)
+
+ -- Simon Horman <horms at debian.org>  Tue, 22 Nov 2005 10:46:22 +0900
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-generic
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-generic	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-generic	Tue Nov 22 01:48:43 2005
@@ -4,7 +4,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 CONFIG_DONGLE_OLD=y

Modified: dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config.alpha-smp	Tue Nov 22 01:48:43 2005
@@ -6,5 +6,4 @@
 CONFIG_NR_CPUS=64
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_MATHEMU=y
-CONFIG_MKISS=m
 # CONFIG_DIGIEPCA is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	Tue Nov 22 01:48:43 2005
@@ -24,7 +24,6 @@
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m
 CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 # CONFIG_FLATMEM_MANUAL is not set
 CONFIG_ARCH_DISCONTIGMEM_ENABLE=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	Tue Nov 22 01:48:43 2005
@@ -8,7 +8,6 @@
 # CONFIG_NUMA is not set
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 # CONFIG_MTD_XIP is not set
-CONFIG_MKISS=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set
 CONFIG_PCMCIA_XIRTULIP=m

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	Tue Nov 22 01:48:43 2005
@@ -23,7 +23,6 @@
 CONFIG_ARCH_FLATMEM_ENABLE=y
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_DIGIEPCA=m
-CONFIG_MKISS=m
 CONFIG_FLATMEM_MANUAL=y
 # CONFIG_SPARSEMEM_MANUAL is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Tue Nov 22 01:48:43 2005
@@ -736,3 +736,4 @@
 CONFIG_VIDEO_DECODER=m
 CONFIG_VIDEO_AUDIO_DECODER=m
 CONFIG_CARDMAN_4040=m
+CONFIG_MKISS=m

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.386
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.386	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.386	Tue Nov 22 01:48:43 2005
@@ -43,7 +43,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686	Tue Nov 22 01:48:43 2005
@@ -34,7 +34,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.686-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.686-smp	Tue Nov 22 01:48:43 2005
@@ -38,7 +38,6 @@
 # CONFIG_SBPCD is not set
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7	Tue Nov 22 01:48:43 2005
@@ -35,7 +35,6 @@
 CONFIG_SBPCD=m
 CONFIG_CM206=m
 CONFIG_CDU31A=m
-CONFIG_MKISS=m
 CONFIG_DMASCC=m
 CONFIG_IRPORT_SIR=m
 # CONFIG_DONGLE_OLD is not set

Modified: dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config.k7-smp	Tue Nov 22 01:48:43 2005
@@ -39,7 +39,6 @@
 # CONFIG_SBPCD is not set
 # CONFIG_CM206 is not set
 # CONFIG_CDU31A is not set
-# CONFIG_MKISS is not set
 # CONFIG_DMASCC is not set
 # CONFIG_IRPORT_SIR is not set
 # CONFIG_NI5010 is not set

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	Tue Nov 22 01:48:43 2005
@@ -1366,6 +1366,5 @@
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_SYSVIPC_COMPAT=y
 # CONFIG_PM_DEBUG is not set
-CONFIG_MKISS=m
 CONFIG_DIGIEPCA=m
 # CONFIG_CPU_FREQ is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	Tue Nov 22 01:48:43 2005
@@ -1253,5 +1253,4 @@
 CONFIG_PM_STD_PARTITION=""
 CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_MKISS=m
 CONFIG_I2C_PMAC_SMU=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 22 01:48:43 2005
@@ -4,7 +4,10 @@
   * New upstream release candidate.
   * Readdition of qla2xxx drivers, as firmware license has been fixed.
 
- -- Frederik Schüler <fs at debian.org>  Sun, 20 Nov 2005 15:05:12 +0100
+  [ Simon Horman ]
+  * Enable MKISS globally (closes: #340215)
+
+ -- Simon Horman <horms at debian.org>  Tue, 22 Nov 2005 10:46:21 +0900
 
 linux-2.6 (2.6.14-3) unstable; urgency=low

More information about the Kernel-svn-changes mailing list