r4171 - in dists/trunk/linux-2.6/debian/arch: . alpha amd64 arm hppa i386 ia64 m68k powerpc s390 sparc

Andres Salomon dilinger at costa.debian.org
Mon Sep 12 03:48:13 UTC 2005 

Author: dilinger
Date: 2005-09-12 03:48:11 +0000 (Mon, 12 Sep 2005)
New Revision: 4171

Modified:
   dists/trunk/linux-2.6/debian/arch/alpha/config
   dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc
   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/amd64/defines
   dists/trunk/linux-2.6/debian/arch/arm/config.rpc
   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/powerpc/config
   dists/trunk/linux-2.6/debian/arch/s390/config
   dists/trunk/linux-2.6/debian/arch/sparc/config
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
   dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
Log:
ugh.  conflicts galore..  suck.


Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -297,6 +297,7 @@
 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
 CONFIG_SCSI_ATA_PIIX=m
@@ -372,6 +373,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/Makefile.inc	2005-09-12 03:48:11 UTC (rev 4171)
@@ -3,5 +3,4 @@
 #
 initrd_modules := kernel/drivers/video/vesafb.ko kernel/security/capability.ko
 headers_dirs = x86_64
-build_makeflags :=  'V=1'
 

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -338,6 +338,7 @@
 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
 CONFIG_SCSI_ATA_PIIX=m
@@ -389,6 +390,7 @@
 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
@@ -1247,6 +1249,7 @@
 # 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
@@ -1736,13 +1739,3 @@
 CONFIG_CRC32=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_DEC16=y
-CONFIG_I2O_EXT_ADAPTEC_DMA64=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_KEXEC is not set
-CONFIG_CRYPTO_AES_X86_64=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_FUSION=y
-CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
-CONFIG_PHYSICAL_START=0x100000
-CONFIG_SELECT_MEMORY_MODEL=y
-# CONFIG_HZ_100 is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-generic	2005-09-12 03:48:11 UTC (rev 4171)
@@ -47,12 +47,3 @@
 CONFIG_EXT2_FS=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_CHECKING is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_HZ_1000=y
-# CONFIG_HZ_250 is not set
-CONFIG_HZ=1000

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8	2005-09-12 03:48:11 UTC (rev 4171)
@@ -47,12 +47,3 @@
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_HZ_1000=y
-# CONFIG_HZ_250 is not set
-CONFIG_HZ=1000

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	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.amd64-k8-smp	2005-09-12 03:48:11 UTC (rev 4171)
@@ -22,17 +22,3 @@
 # CONFIG_SOUND_AWE32_SYNTH is not set
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
-CONFIG_HZ_250=y
-CONFIG_SPARSEMEM=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_HOTPLUG_CPU is not set
-CONFIG_HAVE_MEMORY_PRESENT=y
-# CONFIG_HZ_1000 is not set
-CONFIG_PREEMPT_BKL=y
-CONFIG_HZ=250
-CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
-# CONFIG_FLATMEM_MANUAL is not set

Modified: dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4	2005-09-12 03:48:11 UTC (rev 4171)
@@ -47,12 +47,3 @@
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
 # CONFIG_CHECKING is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-# CONFIG_HZ_250 is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_FLATMEM=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-CONFIG_HZ_1000=y
-CONFIG_HZ=1000
-CONFIG_FLATMEM_MANUAL=y

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	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config.em64t-p4-smp	2005-09-12 03:48:11 UTC (rev 4171)
@@ -20,14 +20,3 @@
 CONFIG_SOUND_AWE32_SYNTH=m
 CONFIG_EXT2_FS=m
 CONFIG_FS_MBCACHE=m
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_HZ_250=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
-# CONFIG_HZ_1000 is not set
-CONFIG_PREEMPT_BKL=y
-CONFIG_HZ=250
-CONFIG_FLATMEM_MANUAL=y

Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
===================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	2005-09-12 03:48:11 UTC (rev 4171)
@@ -7,7 +7,6 @@
  em64t-p4
  em64t-p4-smp
 suggests: lilo (>= 19.1) | grub, fdutils
-kernel-arch: x86_64
 
 [amd64-generic]
 class: all x86-64 

Modified: dists/trunk/linux-2.6/debian/arch/arm/config.rpc
===================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.rpc	2005-09-12 03:48:11 UTC (rev 4171)
@@ -72,6 +72,7 @@
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SATA is not set
 CONFIG_SCSI_PPA=m
 CONFIG_SCSI_IMM=m
 # CONFIG_SCSI_IZIP_EPP16 is not set

Modified: dists/trunk/linux-2.6/debian/arch/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -168,6 +168,7 @@
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
 CONFIG_SECCOMP=y
+CONFIG_TCG_TPM=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_NSC=m
 # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
@@ -289,17 +290,9 @@
 CONFIG_NTFS_RW=y
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
-CONFIG_ACPI_HOTKEY=m
 CONFIG_NFS_COMMON=y
 CONFIG_PREEMPT_NONE=y
-# CONFIG_ACPI_SLEEP_PROC_SLEEP is not set
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_FUSION=m
-CONFIG_SCSI_SATA=y
-# CONFIG_FB_VESA is not set
 # CONFIG_TCG_TPM is not set
-CONFIG_SCSI_QLA2XXX=m
 CONFIG_USB_MON=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_BSD_PROCESS_ACCT=y

Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -194,6 +194,7 @@
 # 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
 # CONFIG_SCSI_DTC3280 is not set
@@ -255,6 +256,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/i386/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/i386/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -402,6 +402,7 @@
 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
 CONFIG_SCSI_ATA_PIIX=m
@@ -485,6 +486,7 @@
 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
@@ -1450,6 +1452,7 @@
 # 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

Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -283,6 +283,7 @@
 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
 CONFIG_SCSI_ATA_PIIX=m
@@ -327,6 +328,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -77,6 +77,7 @@
 # CONFIG_SCSI_SPI_ATTRS is not set
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_MD=y
 CONFIG_BLK_DEV_MD=m

Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -221,6 +221,7 @@
 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
 # CONFIG_SCSI_ATA_PIIX is not set
@@ -274,6 +275,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/s390/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/s390/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -50,6 +50,7 @@
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 # CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_ZFCP=m
 CONFIG_CCW=y
@@ -207,6 +208,7 @@
 # CONFIG_NETCONSOLE is not set
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_SECURITY is not set
 CONFIG_JBD=y

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config	2005-09-12 03:48:11 UTC (rev 4171)
@@ -90,6 +90,7 @@
 # CONFIG_SCSI_AIC7XXX is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_SCSI_SATA is not set
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set
 # CONFIG_SCSI_INIA100 is not set

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64	2005-09-12 03:48:11 UTC (rev 4171)
@@ -144,6 +144,7 @@
 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

Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
===================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-12 03:32:52 UTC (rev 4170)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp	2005-09-12 03:48:11 UTC (rev 4171)
@@ -147,6 +147,7 @@
 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

More information about the Kernel-svn-changes mailing list