Upddated config for 2.6.13
Hi,
there are a couple of requests for various options to be turned
on and off floating around on this list and in the BTS. They all
look pretty reasonable, so I'd like to make them happen.
Unfortunately, the current state of the 386 config for
seems to want the current options changed. And because of the
way that split-config currently works, its difficult
to process the changes requested by users, without making these changes.
Does the following look sane ?
Summary:
Global: CONFIG_FLATMEM_MANUAL y
Global: SELECT_MEMORY_MODEL y
Global: CONFIG_SPARSEMEM_MANUAL n
Global: CONFIG_FLAT_NODE_MEM_MAP y
Global: CONFIG_FLATMEM y
Global: CONFIG_SCSI_QLA2XXX m
Global: CONFIG_DISCONTIGMEM_MANUAL n
Global: CONFIG_USB_EMI26 m
Global: CONFIG_FUSION y
Global: CONFIG_BLK_DEV_IDEPNP y
Patch:
diff --exclude .svn -ru a/debian/arch/alpha/config b/debian/arch/alpha/config
--- a/debian/arch/alpha/config 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/alpha/config 2005-09-21 15:39:18.000000000 +0900
@@ -213,7 +213,6 @@
CONFIG_BLK_DEV_IDESCSI=m
CONFIG_IDE_TASK_IOCTL=y
CONFIG_IDE_GENERIC=m
-# CONFIG_BLK_DEV_IDEPNP is not set
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -329,7 +328,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
@@ -1564,7 +1562,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
diff --exclude .svn -ru a/debian/arch/amd64/config b/debian/arch/amd64/config
--- a/debian/arch/amd64/config 2005-09-20 19:12:42.000000000 +0900
+++ b/debian/arch/amd64/config 2005-09-21 15:39:18.000000000 +0900
@@ -261,7 +261,6 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -1644,19 +1643,16 @@
CONFIG_REED_SOLOMON_DEC16=y
CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
CONFIG_PHYSICAL_START=0x100000
-CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_KEXEC is not set
CONFIG_CRYPTO_AES_X86_64=m
# CONFIG_HZ_250 is not set
CONFIG_I2O_EXT_ADAPTEC_DMA64=y
# CONFIG_HZ_100 is not set
CONFIG_ACPI_HOTKEY=m
-CONFIG_SCSI_QLA2XXX=m
# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
CONFIG_JFFS2_FS_WRITEBUFFER=y
# CONFIG_EXT2_FS_XIP is not set
CONFIG_HZ_1000=y
CONFIG_HZ=1000
# CONFIG_I2O_CONFIG_OLD_IOCTL is not set
-CONFIG_FUSION=y
# CONFIG_FB_VESA is not set
diff --exclude .svn -ru a/debian/arch/amd64/config.amd64-generic b/debian/arch/amd64/config.amd64-generic
--- a/debian/arch/amd64/config.amd64-generic 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/amd64/config.amd64-generic 2005-09-21 15:39:19.000000000 +0900
@@ -48,8 +48,3 @@
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_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ru a/debian/arch/amd64/config.amd64-k8 b/debian/arch/amd64/config.amd64-k8
--- a/debian/arch/amd64/config.amd64-k8 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/amd64/config.amd64-k8 2005-09-21 15:39:19.000000000 +0900
@@ -48,8 +48,3 @@
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_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ru a/debian/arch/amd64/config.amd64-k8-smp b/debian/arch/amd64/config.amd64-k8-smp
--- a/debian/arch/amd64/config.amd64-k8-smp 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/amd64/config.amd64-k8-smp 2005-09-21 15:39:19.000000000 +0900
@@ -23,11 +23,7 @@
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-# CONFIG_FLATMEM_MANUAL is not set
CONFIG_NEED_MULTIPLE_NODES=y
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_DISCONTIGMEM_MANUAL=y
# CONFIG_HOTPLUG_CPU is not set
diff --exclude .svn -ru a/debian/arch/amd64/config.em64t-p4 b/debian/arch/amd64/config.em64t-p4
--- a/debian/arch/amd64/config.em64t-p4 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/amd64/config.em64t-p4 2005-09-21 15:39:19.000000000 +0900
@@ -48,8 +48,3 @@
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_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
diff --exclude .svn -ru a/debian/arch/amd64/config.em64t-p4-smp b/debian/arch/amd64/config.em64t-p4-smp
--- a/debian/arch/amd64/config.em64t-p4-smp 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/amd64/config.em64t-p4-smp 2005-09-21 15:39:19.000000000 +0900
@@ -21,9 +21,4 @@
CONFIG_EXT2_FS=m
CONFIG_FS_MBCACHE=m
CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_HOTPLUG_CPU is not set
diff --exclude .svn -ru a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
--- a/debian/arch/arm/config.footbridge 2005-09-15 11:30:55.000000000 +0900
+++ b/debian/arch/arm/config.footbridge 2005-09-21 15:39:19.000000000 +0900
@@ -86,7 +86,6 @@
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
-# CONFIG_BLK_DEV_IDEPNP is not set
# CONFIG_BLK_DEV_IDEPCI is not set
# CONFIG_IDE_ARM is not set
# CONFIG_IDE_CHIPSETS is not set
diff --exclude .svn -ru a/debian/arch/config b/debian/arch/config
--- a/debian/arch/config 2005-09-20 19:12:42.000000000 +0900
+++ b/debian/arch/config 2005-09-21 15:39:32.000000000 +0900
@@ -579,3 +579,13 @@
CONFIG_SCTP_HMAC_SHA1=y
# CONFIG_SCTP_HMAC_MD5 is not set
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_SELECT_MEMORY_MODEL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_FLATMEM=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+CONFIG_USB_EMI26=m
+CONFIG_FUSION=y
+CONFIG_BLK_DEV_IDEPNP=y
diff --exclude .svn -ru a/debian/arch/hppa/config b/debian/arch/hppa/config
--- a/debian/arch/hppa/config 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/hppa/config 2005-09-21 15:39:18.000000000 +0900
@@ -228,7 +228,6 @@
CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m
CONFIG_DM_MULTIPATH_EMC=m
-# CONFIG_FUSION is not set
# CONFIG_IEEE1394 is not set
CONFIG_I2O=m
CONFIG_I2O_CONFIG=m
diff --exclude .svn -ru a/debian/arch/i386/config b/debian/arch/i386/config
--- a/debian/arch/i386/config 2005-09-20 19:12:41.000000000 +0900
+++ b/debian/arch/i386/config 2005-09-21 15:39:19.000000000 +0900
@@ -322,7 +322,6 @@
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
CONFIG_BLK_DEV_IDEPCI=y
CONFIG_IDEPCI_SHARE_IRQ=y
# CONFIG_BLK_DEV_OFFBOARD is not set
@@ -445,7 +444,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
diff --exclude .svn -ru a/debian/arch/ia64/config b/debian/arch/ia64/config
--- a/debian/arch/ia64/config 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/ia64/config 2005-09-21 15:39:19.000000000 +0900
@@ -288,7 +288,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
diff --exclude .svn -ru a/debian/arch/powerpc/config b/debian/arch/powerpc/config
--- a/debian/arch/powerpc/config 2005-09-20 19:12:41.000000000 +0900
+++ b/debian/arch/powerpc/config 2005-09-21 15:39:19.000000000 +0900
@@ -234,7 +234,6 @@
CONFIG_MD_RAID6=m
CONFIG_MD_FAULTY=m
CONFIG_DM_MULTIPATH_EMC=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
# CONFIG_FUSION_LAN is not set
diff --exclude .svn -ru a/debian/arch/powerpc/config.powerpc64 b/debian/arch/powerpc/config.powerpc64
--- a/debian/arch/powerpc/config.powerpc64 2005-09-20 19:12:41.000000000 +0900
+++ b/debian/arch/powerpc/config.powerpc64 2005-09-21 15:39:19.000000000 +0900
@@ -61,8 +61,5 @@
CONFIG_SYSVIPC_COMPAT=y
CONFIG_THERM_PM72=y
CONFIG_U3_DART=y
-# CONFIG_FLATMEM_MANUAL is not set
-CONFIG_DISCONTIGMEM_MANUAL=y
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_I2O_EXT_ADAPTEC_DMA64=y
CONFIG_WATCHDOG_RTAS=m
diff --exclude .svn -ru a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64
--- a/debian/arch/sparc/config.sparc64 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/sparc/config.sparc64 2005-09-21 15:39:19.000000000 +0900
@@ -129,7 +129,6 @@
CONFIG_SCSI_LPFC=m
CONFIG_SCSI_DC395x=m
CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
diff --exclude .svn -ru a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp
--- a/debian/arch/sparc/config.sparc64-smp 2005-09-15 11:30:56.000000000 +0900
+++ b/debian/arch/sparc/config.sparc64-smp 2005-09-21 15:39:19.000000000 +0900
@@ -133,7 +133,6 @@
CONFIG_SCSI_LPFC=m
CONFIG_SCSI_DC395x=m
CONFIG_SCSI_SUNESP=m
-CONFIG_FUSION=m
CONFIG_FUSION_MAX_SGE=40
CONFIG_FUSION_CTL=m
CONFIG_FUSION_LAN=m
Reply to: