[kernel] r7571 - in dists/trunk/linux-2.6/debian: . arch arch/alpha arch/amd64 arch/arm arch/armeb arch/hppa arch/i386 arch/ia64 arch/m68k arch/mips arch/mipsel arch/powerpc arch/sparc

Frederik Schüler fs at costa.debian.org
Mon Oct 2 13:23:21 UTC 2006 

Author: fs
Date: Mon Oct  2 13:23:20 2006
New Revision: 7571

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/config
   dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
   dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
   dists/trunk/linux-2.6/debian/arch/config
   dists/trunk/linux-2.6/debian/arch/hppa/config
   dists/trunk/linux-2.6/debian/arch/i386/config
   dists/trunk/linux-2.6/debian/arch/ia64/config
   dists/trunk/linux-2.6/debian/arch/m68k/config
   dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
   dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/arch/powerpc/config
   dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/changelog

Log:
Activate CONFIG_IDE_TASK_IOCTL globally. (Closes: #390616)
Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.



Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	Mon Oct  2 13:23:20 2006
@@ -407,19 +407,7 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	Mon Oct  2 13:23:20 2006
@@ -377,24 +377,12 @@
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
@@ -1458,4 +1446,6 @@
 CONFIG_IOMMU=y
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_ACPI_SBS=m
-CONFIG_SCSI_ARCMSR=m 
+CONFIG_AUDIT_ARCH=y
+# CONFIG_ASFS_FS is not set
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Mon Oct  2 13:23:20 2006
@@ -1838,7 +1838,6 @@
 # CONFIG_IEEE1394_AMDTP is not set
 CONFIG_BLK_DEV_PDC202XX_OLD=m
 # CONFIG_LANCE is not set
-# CONFIG_NET_CLS_ROUTE is not set
 CONFIG_VIDEO_TVEEPROM=m
 # CONFIG_USB_AUDIO is not set
 CONFIG_VIDEO_IR=m

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.iop32x	Mon Oct  2 13:23:20 2006
@@ -441,21 +441,8 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_BASIC is not set
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #
@@ -649,7 +636,6 @@
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx	Mon Oct  2 13:23:20 2006
@@ -470,21 +470,8 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_BASIC is not set
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.s3c2410	Mon Oct  2 13:23:20 2006
@@ -1216,7 +1216,6 @@
 # CONFIG_USB_BANDWIDTH is not set
 CONFIG_PPP=m
 CONFIG_CRC_CCITT=m
-# CONFIG_NET_CLS_ROUTE is not set
 # CONFIG_LANCE is not set
 # CONFIG_SCSI_T128 is not set
 # CONFIG_SCSI_ADVANSYS is not set

Modified: dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	(original)
+++ dists/trunk/linux-2.6/debian/arch/armeb/config.nslu2	Mon Oct  2 13:23:20 2006
@@ -475,21 +475,8 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_BASIC is not set
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 # CONFIG_NET_EMATCH is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #

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	Mon Oct  2 13:23:20 2006
@@ -49,7 +49,6 @@
 CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_VLAN_8021Q=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
 CONFIG_EQUALIZER=m
@@ -652,7 +651,6 @@
 CONFIG_MKISS=m
 CONFIG_VIDEO_BT848_DVB=y
 CONFIG_ATM_DUMMY=m
-# CONFIG_IDE_TASK_IOCTL is not set
 CONFIG_VIDEO_SAA7134_OSS=m
 CONFIG_VIDEO_SAA7134_DVB=m
 CONFIG_VIDEO_SAA7134_ALSA=m
@@ -1037,3 +1035,19 @@
 # CONFIG_EMBEDDED is not set
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_IDE_TASK_IOCTL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_DVB_PLL=m

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	Mon Oct  2 13:23:20 2006
@@ -263,25 +263,12 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_CLS_U32_PERF=y
-CONFIG_NET_CLS_IND=y
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	Mon Oct  2 13:23:20 2006
@@ -474,24 +474,12 @@
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y
@@ -1679,7 +1667,7 @@
 CONFIG_EDAC_R82600=m
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
-CONFIG_EFI_VARS=y
+CONFIG_EFI_VARS=m
 CONFIG_BOOT_IOREMAP=y
 CONFIG_EFI=y
 CONFIG_HW_RANDOM_INTEL=m

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	Mon Oct  2 13:23:20 2006
@@ -367,24 +367,12 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	Mon Oct  2 13:23:20 2006
@@ -89,7 +89,6 @@
 # CONFIG_ECONET is not set
 # CONFIG_WAN_ROUTER is not set
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 # CONFIG_NET_PKTGEN is not set
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_RX is not set

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r4k-ip22	Mon Oct  2 13:23:20 2006
@@ -450,17 +450,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -468,9 +457,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.r5k-ip32	Mon Oct  2 13:23:20 2006
@@ -451,17 +451,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -469,9 +458,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1-bcm91250a	Mon Oct  2 13:23:20 2006
@@ -471,17 +471,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -489,9 +478,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #
@@ -568,7 +555,6 @@
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

Modified: dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mips/config.sb1a-bcm91480b	Mon Oct  2 13:23:20 2006
@@ -467,17 +467,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -485,9 +474,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #
@@ -564,7 +551,6 @@
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r3k-kn02	Mon Oct  2 13:23:20 2006
@@ -419,7 +419,6 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r4k-kn04	Mon Oct  2 13:23:20 2006
@@ -421,7 +421,6 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.r5k-cobalt	Mon Oct  2 13:23:20 2006
@@ -416,7 +416,6 @@
 # QoS and/or fair queueing
 #
 # CONFIG_NET_SCHED is not set
-CONFIG_NET_CLS_ROUTE=y
 
 #
 # Network testing
@@ -497,7 +496,6 @@
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1-bcm91250a	Mon Oct  2 13:23:20 2006
@@ -471,17 +471,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -489,9 +478,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #
@@ -568,7 +555,6 @@
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

Modified: dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	(original)
+++ dists/trunk/linux-2.6/debian/arch/mipsel/config.sb1a-bcm91480b	Mon Oct  2 13:23:20 2006
@@ -467,17 +467,6 @@
 #
 # Classification
 #
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@@ -485,9 +474,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 # CONFIG_NET_EMATCH_TEXT is not set
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
-# CONFIG_NET_CLS_IND is not set
 CONFIG_NET_ESTIMATOR=y
 
 #
@@ -564,7 +551,6 @@
 CONFIG_BLK_DEV_IDETAPE=m
 CONFIG_BLK_DEV_IDEFLOPPY=m
 # CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
 
 #
 # IDE chipset support/bugfixes

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	Mon Oct  2 13:23:20 2006
@@ -299,24 +299,12 @@
 CONFIG_NET_SCH_INGRESS=m
 CONFIG_NET_QOS=y
 CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_NET_CLS_IND is not set
-CONFIG_CLS_U32_MARK=y
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_NBYTE=m
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
-# CONFIG_NET_CLS_ACT is not set
 CONFIG_NET_CLS_POLICE=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NETPOLL=y
@@ -1239,3 +1227,4 @@
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_IPW2100 is not set
 CONFIG_HVC_RTAS=y
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.powerpc-miboot	Mon Oct  2 13:23:20 2006
@@ -22,7 +22,6 @@
 # CONFIG_NETFILTER is not set
 # CONFIG_NET_DIVERT is not set
 # CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_NETPOLL_TRAP is not set
 # CONFIG_HAMRADIO is not set
@@ -73,7 +72,6 @@
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
 
 CONFIG_FB_CONTROL=y
 CONFIG_FB_PLATINUM=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	Mon Oct  2 13:23:20 2006
@@ -72,7 +72,6 @@
 # CONFIG_INPUT_EVBUG is not set
 CONFIG_NET_SCH_NETEM=m
 # Wireless LAN (non-hamradio)
-CONFIG_VIDEO_V4L2=y
 # CONFIG_HP100 is not set
 # I2C support
 # CONFIG_DVB is not set
@@ -82,7 +81,6 @@
 # CONFIG_IPMI_HANDLER is not set
 # RTC interfaces
 # CONFIG_USB_GADGET is not set
-CONFIG_NET_CLS_TCINDEX=m
 # CONFIG_FB_P9100 is not set
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_SND_SERIAL_U16550 is not set
@@ -149,7 +147,6 @@
 CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_MOUSEDEV=y
-CONFIG_NET_CLS_RSVP=m
 CONFIG_ATALK=m
 CONFIG_IP_PNP_RARP=y
 CONFIG_INPUT_MOUSE=y
@@ -186,7 +183,6 @@
 # CONFIG_KEYBOARD_XTKBD is not set
 # Network device support
 CONFIG_DECNET_ROUTE_FWMARK=y
-CONFIG_NET_CLS_FW=m
 CONFIG_PPPOE=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_AFFS_FS=m
@@ -277,9 +273,7 @@
 # CONFIG_SND_ICE1712 is not set
 # Ftape, the floppy tape device driver
 # PHY device support
-# CONFIG_CLS_U32_MARK is not set
 # CONFIG_INFINIBAND is not set
-# CONFIG_CLS_U32_PERF is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_NET_RADIO is not set
 # CONFIG_VXFS_FS is not set
@@ -357,7 +351,6 @@
 # CONFIG_R8169 is not set
 CONFIG_FONT_SUN8x16=y
 CONFIG_BNX2=m
-# CONFIG_NET_CLS_IND is not set
 # CONFIG_FB_RIVA is not set
 # CONFIG_MTD is not set
 # CONFIG_ULTRIX_PARTITION is not set
@@ -380,10 +373,7 @@
 # CONFIG_IP_PNP_DHCP is not set
 # TIPC Configuration (EXPERIMENTAL)
 # CONFIG_CIFS_STATS is not set
-CONFIG_NET_CLS=y
-# CONFIG_NET_CLS_ACT is not set
 # CONFIG_FONTS is not set
-CONFIG_NET_CLS_RSVP6=m
 # Network testing
 # CONFIG_INPUT_TSDEV is not set
 # Pseudo filesystems
@@ -410,15 +400,12 @@
 CONFIG_SERIO=y
 # Fusion MPT device support
 # CONFIG_AMIGA_PARTITION is not set
-CONFIG_NET_CLS_ROUTE4=m
 # Parallel port support
 # CONFIG_SND_ICE1724 is not set
-CONFIG_NET_CLS_BASIC=m
 CONFIG_HW_CONSOLE=y
 # SPI Master Controller Drivers
 # CONFIG_BSD_DISKLABEL is not set
 # CONFIG_FB_SAVAGE is not set
-CONFIG_NET_CLS_U32=m
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 # CONFIG_NETPOLL_RX is not set
 # CONFIG_FB_MATROX is not set
@@ -440,3 +427,4 @@
 # CONFIG_SND_HDA_INTEL is not set
 # MII PHY device drivers
 # CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+CONFIG_SCSI_ARCMSR=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Oct  2 13:23:20 2006
@@ -7,7 +7,12 @@
   * [alpha] restore alpha-prctl.patch, which keeps disappearing every time
     there's a kernel upgrade :/
 
- -- Steve Langasek <vorlon at debian.org>  Sat, 30 Sep 2006 02:28:29 -0700
+  [ Frederik Schüler ]
+  * Activate CONFIG_IDE_TASK_IOCTL globally. (Closes: #390616)
+  * Activate CONFIG_NET_CLS_* globaly. (Closes: #389918)
+  * Make CONFIG_EFI_VARS modular on i386. (Closes: #381951)
+  * Activate CONFIG_SCSI_ARCMSR on amd64, powerpc, sparc too.
+ -- Frederik Schüler <fs at debian.org>  Mon,  2 Oct 2006 15:17:27 +0200
 
 linux-2.6 (2.6.18-2) unstable; urgency=low

More information about the Kernel-svn-changes mailing list