[kernel] r4829 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm i386 ia64 m68k powerpc

Frederik Schüler fschueler-guest at costa.debian.org
Tue Nov 15 13:23:44 UTC 2005 

Author: fschueler-guest
Date: Tue Nov 15 13:23:41 2005
New Revision: 4829

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/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/arm/config.footbridge
   dists/trunk/linux-2.6/debian/arch/arm/config.ixp4xx
   dists/trunk/linux-2.6/debian/arch/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/powerpc/config.apus
Log:
- QLA2XXX options activated globally.
- CONFIG_SCTP_HMAC_MD5=y set globally - or better default to CONFIG_SCTP_HMAC_SHA1=y?
- Memory model options removed from global config: every arch must set their memory model by arch/flavour now (FLATMEM, or DISCONTIGMEM on NUMA).
- new option: DEFAULT_IOSCHED="anticipatory" - everyone OK with this or better use the deadline scheduler?
- CONFIG_SPLIT_PTLOCK_CPUS must be set per-arch



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	Tue Nov 15 13:23:41 2005
@@ -454,8 +454,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
 CONFIG_ATM=y
 CONFIG_ATM_CLIP=y
 # CONFIG_ATM_CLIP_NO_ICMP is not set

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	Tue Nov 15 13:23:41 2005
@@ -476,8 +476,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
 CONFIG_ATM=y
 CONFIG_ATM_CLIP=y
 # CONFIG_ATM_CLIP_NO_ICMP is not set
@@ -1654,3 +1652,4 @@
 CONFIG_W83977F_WDT=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_USB_SUSPEND=y
+CONFIG_SPLIT_PTLOCK_CPUS=4

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 15 13:23:41 2005
@@ -48,3 +48,6 @@
 CONFIG_FS_MBCACHE=y
 # CONFIG_CHECKING is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set

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 15 13:23:41 2005
@@ -48,3 +48,6 @@
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set

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 15 13:23:41 2005
@@ -10,7 +10,6 @@
 # CONFIG_SCHED_SMT is not set
 CONFIG_K8_NUMA=y
 # CONFIG_NUMA_EMU is not set
-CONFIG_DISCONTIGMEM=y
 CONFIG_NUMA=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_NR_CPUS=32
@@ -23,15 +22,14 @@
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
 CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
 # CONFIG_HOTPLUG_CPU is not set
-CONFIG_SPARSEMEM=y
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 CONFIG_HAVE_MEMORY_PRESENT=y
 CONFIG_DIGIEPCA=m
 CONFIG_MKISS=m
+CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
 # CONFIG_FLATMEM_MANUAL is not set
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
 # CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_DISCONTIGMEM=y
 CONFIG_DISCONTIGMEM_MANUAL=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 15 13:23:41 2005
@@ -48,3 +48,6 @@
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
 CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+# CONFIG_DISCONTIGMEM_MANUAL is not set

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 15 13:23:41 2005
@@ -24,3 +24,6 @@
 # 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/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge	Tue Nov 15 13:23:41 2005
@@ -539,7 +539,6 @@
 # CONFIG_SCSI_QLOGIC_FAS is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA2XXX is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_SYM53C416 is not set
 # CONFIG_SCSI_DC395x is not set

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	Tue Nov 15 13:23:41 2005
@@ -1449,4 +1449,3 @@
 CONFIG_TEXTSEARCH_KMP=m
 CONFIG_TEXTSEARCH_BM=m
 CONFIG_TEXTSEARCH_FSM=m
-CONFIG_SCSI_QLA2XXX=m

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 15 13:23:41 2005
@@ -164,7 +164,6 @@
 CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_PCMCIA_LOAD_CIS=y
 CONFIG_DVB_USB=m
-CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_USB_LD=m
 CONFIG_SERIAL_8250_FOURPORT=m
 CONFIG_DVB_USB_VP7045=m
@@ -573,8 +572,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
 
 # CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_W1_DS2433_CRC=y
@@ -614,7 +611,6 @@
 # CONFIG_WANT_EARLY_SERIAL is not set
 # CONFIG_IEEE80211_DEBUG is not set
 CONFIG_DAVICOM_PHY=m
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_IP_NF_CONNTRACK_EVENTS=y
 CONFIG_IP_NF_NAT_PPTP=m
 CONFIG_USB_SISUSBVGA_CON=y
@@ -630,7 +626,6 @@
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_USB_STORAGE_ONETOUCH=y
-# CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_DRM_SAVAGE=m
 CONFIG_NETFILTER_NETLINK_LOG=m
 CONFIG_PHYLIB=m
@@ -646,7 +641,6 @@
 CONFIG_INFINIBAND_USER_MAD=m
 CONFIG_IP_NF_CONNTRACK_NETLINK=m
 CONFIG_IP6_NF_TARGET_REJECT=m
-# CONFIG_DISCONTIGMEM_MANUAL is not set
 CONFIG_HOSTAP_PLX=m
 CONFIG_IEEE80211_CRYPT_WEP=m
 CONFIG_USB_NET_PLUSB=m
@@ -696,10 +690,44 @@
 # CONFIG_NET_POCKET is not set
 CONFIG_FW_LOADER=m
 CONFIG_MII=m
-# CONFIG_SCSI_QLA2XXX is not set
 CONFIG_BLK_DEV_IDEPNP=m
 CONFIG_AIRO=m
 CONFIG_SCSI_SATA_INTEL_COMBINED=y
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_XFS_QUOTA=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_SCSI_QLA6312=m
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_SCSI_QLA2322=m
+CONFIG_RTC_X1205_I2C=m
+CONFIG_SCSI_QLA21XX=m
+CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_USB_SERIAL_NOKIA_DKU2=m
+CONFIG_DEFAULT_AS=y
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_SCSI_SATA_SIL24=m
+CONFIG_SCSI_QLA2300=m
+CONFIG_MTD_ONENAND=m
+CONFIG_VIDEO_BT848_DVB=m
+CONFIG_PPP_MPPE=m
+# CONFIG_DEFAULT_CFQ is not set
+CONFIG_SCSI_PDC_ADMA=m
+CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y
+# CONFIG_OBSOLETE_OSS_DRIVER is not set
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_VIDEO_EM28XX=m
+CONFIG_RFD_FTL=m
+# CONFIG_DEBUG_VM is not set
+CONFIG_SCSI_QLA22XX=m
+CONFIG_DVB_NXT200X=m
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_ISCSI_TCP=m
+CONFIG_SCSI_QLA24XX=m
+CONFIG_SCSI_QLA2XXX=m
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_TELCLOCK=m

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	Tue Nov 15 13:23:41 2005
@@ -573,8 +573,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
 CONFIG_ATM=y
 CONFIG_ATM_CLIP=y
 # CONFIG_ATM_CLIP_NO_ICMP 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 15 13:23:41 2005
@@ -420,8 +420,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 CONFIG_SCTP_HMAC_NONE=y
-# CONFIG_SCTP_HMAC_SHA1 is not set
-# CONFIG_SCTP_HMAC_MD5 is not set
 # CONFIG_ATM is not set
 CONFIG_BRIDGE=m
 CONFIG_DECNET=m

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	Tue Nov 15 13:23:41 2005
@@ -190,8 +190,6 @@
 # CONFIG_SCTP_DBG_MSG is not set
 # CONFIG_SCTP_DBG_OBJCNT is not set
 # CONFIG_SCTP_HMAC_NONE is not set
-# CONFIG_SCTP_HMAC_SHA1 is not set
-CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_ATM is not set
 # CONFIG_BRIDGE is not set
 # CONFIG_VLAN_8021Q is not set

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config.apus
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	(original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config.apus	Tue Nov 15 13:23:41 2005
@@ -320,11 +320,6 @@
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set

More information about the Kernel-svn-changes mailing list