On Wed, Sep 21, 2005 at 03:44:59PM +0900, Horms wrote:
> 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 ?

As raised by Jurij, the EMI26 seems to still have licencing problems,
so I have disabled it. And to clarify, the SCSI_QLA2XXX does
not, on inspection of Kconfig, appear to cause any code to be compiled,
or not compiled. I'm not really sure what it does, or how it could
be turned off.

Here are the new options:

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           n
Global: CONFIG_FUSION              y
Global: CONFIG_BLK_DEV_IDEPNP      y


diff --exclude .svn -ru 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/alpha/config 
./debian/arch/alpha/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/alpha/config 
    2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/alpha/config  2005-09-21 16:06:40.000000000 +0900
@@ -329,7 +329,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 +1563,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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config 
./debian/arch/amd64/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config 
    2005-09-20 19:12:42.000000000 +0900
+++ ./debian/arch/amd64/config  2005-09-21 16:06:40.000000000 +0900
@@ -1644,19 +1644,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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-generic
 ./debian/arch/amd64/config.amd64-generic
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-generic
       2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/amd64/config.amd64-generic    2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8
 ./debian/arch/amd64/config.amd64-k8
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8
    2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/amd64/config.amd64-k8 2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8-smp
 ./debian/arch/amd64/config.amd64-k8-smp
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.amd64-k8-smp
        2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/amd64/config.amd64-k8-smp     2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4
 ./debian/arch/amd64/config.em64t-p4
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4
    2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/amd64/config.em64t-p4 2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4-smp
 ./debian/arch/amd64/config.em64t-p4-smp
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/amd64/config.em64t-p4-smp
        2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/amd64/config.em64t-p4-smp     2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/config 
./debian/arch/config
--- /home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/config   
2005-09-20 19:12:42.000000000 +0900
+++ ./debian/arch/config        2005-09-21 16:06:40.000000000 +0900
@@ -579,3 +579,12 @@
 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 is not set
+CONFIG_FUSION=y
diff --exclude .svn -ru 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/hppa/config 
./debian/arch/hppa/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/hppa/config  
    2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/hppa/config   2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/i386/config 
./debian/arch/i386/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/i386/config  
    2005-09-20 19:12:41.000000000 +0900
+++ ./debian/arch/i386/config   2005-09-21 16:06:40.000000000 +0900
@@ -445,7 +445,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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/ia64/config 
./debian/arch/ia64/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/ia64/config  
    2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/ia64/config   2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config
 ./debian/arch/powerpc/config
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config
   2005-09-20 19:12:41.000000000 +0900
+++ ./debian/arch/powerpc/config        2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config.powerpc64
 ./debian/arch/powerpc/config.powerpc64
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/powerpc/config.powerpc64
 2005-09-20 19:12:41.000000000 +0900
+++ ./debian/arch/powerpc/config.powerpc64      2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64
 ./debian/arch/sparc/config.sparc64
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64
     2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/sparc/config.sparc64  2005-09-21 16:06:40.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 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64-smp
 ./debian/arch/sparc/config.sparc64-smp
--- 
/home/horms/work/debian-kernel/debian-2.6-experimental/debian/arch/sparc/config.sparc64-smp
 2005-09-15 11:30:56.000000000 +0900
+++ ./debian/arch/sparc/config.sparc64-smp      2005-09-21 16:06:40.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


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to