r4069 - in branches/dist/sid/kernel/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64 arch/m68k arch/powerpc arch/s390 arch/sparc

Simon Horman horms at costa.debian.org
Tue Aug 30 08:23:26 UTC 2005 

Author: horms
Date: 2005-08-30 08:23:23 +0000 (Tue, 30 Aug 2005)
New Revision: 4069

Modified:
   branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.footbridge
   branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx
   branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.rpc
   branches/dist/sid/kernel/linux-2.6/debian/arch/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc
   branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc-smp
   branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64
   branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64-smp
   branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/ia64/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.amiga
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.atari
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.bvme6000
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.hp
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mac
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme147
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme16x
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.q40
   branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.sun3
   branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config.powerpc64
   branches/dist/sid/kernel/linux-2.6/debian/arch/s390/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config
   branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64
   branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64-smp
   branches/dist/sid/kernel/linux-2.6/debian/changelog
Log:
  * zlib deflateBound() patch added as part of the 2.6.12.5 patch in
    2.6.12-3 now has a CAN number.
    See CAN-2005-2457


Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/alpha/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -267,7 +267,6 @@
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
@@ -298,7 +297,6 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -1611,7 +1609,6 @@
 CONFIG_USB_SERIAL_OPTION=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_EZUSB=y
-# CONFIG_USB_EMI26 is not set
 CONFIG_USB_AUERSWALD=m
 CONFIG_USB_RIO500=m
 CONFIG_USB_LEGOTOWER=m
@@ -1695,9 +1692,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/amd64/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -313,7 +313,6 @@
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
@@ -339,7 +338,6 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -1251,7 +1249,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -1625,9 +1622,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.footbridge
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.footbridge	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.footbridge	2005-08-30 08:23:23 UTC (rev 4069)
@@ -1120,7 +1120,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.ixp4xx	2005-08-30 08:23:23 UTC (rev 4069)
@@ -1052,7 +1052,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.rpc	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/arm/config.rpc	2005-08-30 08:23:23 UTC (rev 4069)
@@ -266,7 +266,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -795,7 +794,6 @@
 CONFIG_ADFS_FS=y
 # CONFIG_ADFS_FS_RW is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -178,3 +178,6 @@
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_6PACK=m
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_USB_EMI26 is not set
+# CONFIG_FB_VESA is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -275,7 +275,6 @@
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -308,7 +307,6 @@
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_LEGACY=m
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1434,7 +1432,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc	2005-08-30 08:23:23 UTC (rev 4069)
@@ -275,7 +275,6 @@
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -308,7 +307,6 @@
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_LEGACY=m
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1434,7 +1432,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc-smp
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc-smp	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc-smp	2005-08-30 08:23:23 UTC (rev 4069)
@@ -279,7 +279,6 @@
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -312,7 +311,6 @@
 # CONFIG_SCSI_DPT_I2O is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_LEGACY=m
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1436,7 +1434,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64	2005-08-30 08:23:23 UTC (rev 4069)
@@ -278,7 +278,6 @@
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -309,7 +308,6 @@
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_LEGACY=m
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1430,7 +1428,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64-smp
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64-smp	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/hppa/config.parisc64-smp	2005-08-30 08:23:23 UTC (rev 4069)
@@ -282,7 +282,6 @@
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -313,7 +312,6 @@
 # CONFIG_SCSI_AIC79XX is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_MEGARAID_NEWGEN is not set
-CONFIG_MEGARAID_LEGACY=m
 # CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_BUSLOGIC is not set
 # CONFIG_SCSI_DMX3191D is not set
@@ -1432,7 +1430,6 @@
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/i386/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -371,7 +371,6 @@
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
@@ -403,7 +402,6 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -1454,7 +1452,6 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -1876,9 +1873,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/ia64/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/ia64/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/ia64/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -258,7 +258,6 @@
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
@@ -284,7 +283,6 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 # CONFIG_SCSI_SATA_SVW is not set
@@ -1340,9 +1338,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -205,7 +205,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -846,9 +845,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=y
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.amiga
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.amiga	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.amiga	2005-08-30 08:23:23 UTC (rev 4069)
@@ -205,7 +205,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -846,9 +845,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=y
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.atari
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.atari	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.atari	2005-08-30 08:23:23 UTC (rev 4069)
@@ -194,7 +194,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -744,9 +743,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.bvme6000
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.bvme6000	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.bvme6000	2005-08-30 08:23:23 UTC (rev 4069)
@@ -164,7 +164,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -689,9 +688,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.hp
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.hp	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.hp	2005-08-30 08:23:23 UTC (rev 4069)
@@ -164,7 +164,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -680,9 +679,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mac
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mac	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mac	2005-08-30 08:23:23 UTC (rev 4069)
@@ -188,7 +188,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -754,9 +753,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=y
 CONFIG_HFSPLUS_FS=y
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme147
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme147	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme147	2005-08-30 08:23:23 UTC (rev 4069)
@@ -163,7 +163,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -707,9 +706,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme16x
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme16x	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.mvme16x	2005-08-30 08:23:23 UTC (rev 4069)
@@ -164,7 +164,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -712,9 +711,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.q40
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.q40	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.q40	2005-08-30 08:23:23 UTC (rev 4069)
@@ -191,7 +191,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -771,9 +770,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.sun3
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.sun3	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/m68k/config.sun3	2005-08-30 08:23:23 UTC (rev 4069)
@@ -151,7 +151,6 @@
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=m
-# CONFIG_CHR_DEV_SCH is not set
 
 #
 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
@@ -693,9 +692,6 @@
 #
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-# CONFIG_ASFS_RW is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -195,7 +195,6 @@
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 CONFIG_SCSI_LOGGING=y
@@ -222,7 +221,6 @@
 CONFIG_MEGARAID_NEWGEN=y
 CONFIG_MEGARAID_MM=m
 CONFIG_MEGARAID_MAILBOX=m
-# CONFIG_MEGARAID_LEGACY is not set
 CONFIG_SCSI_SATA=y
 CONFIG_SCSI_SATA_AHCI=m
 CONFIG_SCSI_SATA_SVW=m
@@ -1321,9 +1319,6 @@
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_ASFS_FS=m
-CONFIG_ASFS_DEFAULT_CODEPAGE=""
-CONFIG_ASFS_RW=y
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config.powerpc64
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/powerpc/config.powerpc64	2005-08-30 08:23:23 UTC (rev 4069)
@@ -30,7 +30,6 @@
 # CONFIG_KPROBES is not set
 CONFIG_LOCK_KERNEL=y
 CONFIG_LPARCFG=m
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_MPIC_BROKEN_U3=y
 CONFIG_NR_CPUS=32
 CONFIG_NUMA=y

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/s390/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/s390/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/s390/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -47,7 +47,6 @@
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-# CONFIG_CHR_DEV_SCH is not set
 CONFIG_SCSI_MULTI_LUN=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
@@ -231,7 +230,6 @@
 # CONFIG_TMPFS_XATTR is not set
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
-# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config	2005-08-30 08:23:23 UTC (rev 4069)
@@ -84,7 +84,6 @@
 CONFIG_ATA_OVER_ETH=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SCH=m
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_SPI_ATTRS=m
@@ -366,7 +365,6 @@
 CONFIG_TMPFS_SECURITY=y
 # CONFIG_ADFS_FS is not set
 CONFIG_AFFS_FS=m
-# CONFIG_ASFS_FS is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 CONFIG_BEFS_FS=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64	2005-08-30 08:23:23 UTC (rev 4069)
@@ -123,7 +123,6 @@
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_PPA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64-smp
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-08-30 08:23:23 UTC (rev 4069)
@@ -126,7 +126,6 @@
 # CONFIG_AIC79XX_DEBUG_ENABLE is not set
 CONFIG_AIC79XX_DEBUG_MASK=0
 # CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
-CONFIG_MEGARAID_LEGACY=m
 CONFIG_SCSI_DMX3191D=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_PPA=m

Modified: branches/dist/sid/kernel/linux-2.6/debian/changelog
===================================================================
--- branches/dist/sid/kernel/linux-2.6/debian/changelog	2005-08-30 08:21:07 UTC (rev 4068)
+++ branches/dist/sid/kernel/linux-2.6/debian/changelog	2005-08-30 08:23:23 UTC (rev 4069)
@@ -17,8 +17,11 @@
   * net-sockglue-cap.patch
     [Security] Restrict socket policy loading to CAP_NET_ADMIN.
     See CAN-2005-2555.
+  * zlib deflateBound() patch added as part of the 2.6.12.5 patch in 
+    2.6.12-3 now has a CAN number.
+    See CAN-2005-2457
 
- -- Simon Horman <horms at debian.org>  Mon, 22 Aug 2005 15:04:40 +0900
+ -- Simon Horman <horms at debian.org>  Tue, 30 Aug 2005 17:21:24 +0900
 
 linux-2.6 (2.6.12-5) unstable; urgency=low

More information about the Kernel-svn-changes mailing list