SOURCES (LINUX_2_6): kernel-i386.config, kernel-ia64.config, kerne...
zbyniu
zbyniu at pld-linux.org
Sun Apr 13 00:29:03 CEST 2008
Author: zbyniu Date: Sat Apr 12 22:29:03 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- DLM and PROFILING to multiarch; cleanups
---- Files affected:
SOURCES:
kernel-i386.config (1.82.10.198 -> 1.82.10.199) , kernel-ia64.config (1.1.2.50 -> 1.1.2.51) , kernel-sparc.config (1.37.2.152 -> 1.37.2.153) , kernel-sparc64.config (1.48.2.141 -> 1.48.2.142) , kernel-ppc.config (1.3.2.3.2.2.2.227 -> 1.3.2.3.2.2.2.228) , kernel-ppc64.config (1.1.2.25 -> 1.1.2.26) , kernel-x86_64.config (1.1.2.167 -> 1.1.2.168) , kernel-multiarch.config (1.1.2.12 -> 1.1.2.13)
---- Diffs:
================================================================
Index: SOURCES/kernel-i386.config
diff -u SOURCES/kernel-i386.config:1.82.10.198 SOURCES/kernel-i386.config:1.82.10.199
--- SOURCES/kernel-i386.config:1.82.10.198 Sat Apr 12 23:00:43 2008
+++ SOURCES/kernel-i386.config Sun Apr 13 00:28:57 2008
@@ -3074,20 +3074,6 @@
CONFIG_UIO_CIF=m
#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Instrumentation Support
-#
-CONFIG_INSTRUMENTATION=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
-
-#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
================================================================
Index: SOURCES/kernel-ia64.config
diff -u SOURCES/kernel-ia64.config:1.1.2.50 SOURCES/kernel-ia64.config:1.1.2.51
--- SOURCES/kernel-ia64.config:1.1.2.50 Sat Apr 12 23:00:43 2008
+++ SOURCES/kernel-ia64.config Sun Apr 13 00:28:57 2008
@@ -2415,13 +2415,6 @@
CONFIG_MSPEC=m
#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_SCTP is not set
-# CONFIG_DLM_DEBUG is not set
-
-#
# Library routines
#
CONFIG_BITREVERSE=y
@@ -2455,13 +2448,6 @@
CONFIG_HP_SIMSERIAL_CONSOLE=y
#
-# Instrumentation Support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
-
-#
# Kernel hacking
#
CONFIG_PRINTK_TIME=y
================================================================
Index: SOURCES/kernel-sparc.config
diff -u SOURCES/kernel-sparc.config:1.37.2.152 SOURCES/kernel-sparc.config:1.37.2.153
--- SOURCES/kernel-sparc.config:1.37.2.152 Sat Apr 12 23:00:43 2008
+++ SOURCES/kernel-sparc.config Sun Apr 13 00:28:58 2008
@@ -1729,19 +1729,6 @@
CONFIG_UNIX98_PTY_COUNT=256
#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Instrumentation Support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
-
-#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
================================================================
Index: SOURCES/kernel-sparc64.config
diff -u SOURCES/kernel-sparc64.config:1.48.2.141 SOURCES/kernel-sparc64.config:1.48.2.142
--- SOURCES/kernel-sparc64.config:1.48.2.141 Sat Apr 12 23:00:43 2008
+++ SOURCES/kernel-sparc64.config Sun Apr 13 00:28:58 2008
@@ -30,15 +30,11 @@
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
#
-# Code maturity level options
+# General setup
#
CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
@@ -160,6 +156,7 @@
# CONFIG_FLATMEM_MANUAL is not set
# CONFIG_DISCONTIGMEM_MANUAL is not set
CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_SUN_LDOMS=y
CONFIG_SPARSEMEM=y
CONFIG_HAVE_MEMORY_PRESENT=y
@@ -558,7 +555,6 @@
CONFIG_BLK_DEV_IDESCSI=m
CONFIG_IDE_TASK_IOCTL=y
CONFIG_IDE_PROC_FS=y
-CONFIG_PROC_KCORE=y
#
# IDE chipset support/bugfixes
@@ -1572,19 +1568,34 @@
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_BT848_DVB=y
+CONFIG_VIDEO_SAA6588=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_CPIA2=m
CONFIG_VIDEO_SAA5246A=m
CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
# CONFIG_TUNER_TEA5761 is not set
CONFIG_VIDEO_SAA7134=m
CONFIG_VIDEO_SAA7134_ALSA=m
# CONFIG_VIDEO_SAA7134_OSS is not set
# CONFIG_VIDEO_SAA7134_DVB is not set
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DPC=m
CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
# CONFIG_VIDEO_CX88_DVB is not set
+CONFIG_VIDEO_IVTV=m
CONFIG_VIDEO_CAFE_CCIC=m
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_RADIO_ADAPTERS=y
@@ -1599,6 +1610,13 @@
#
# Supported SAA7146 based PCI Adapters
#
+CONFIG_DVB_AV7110=m
+# CONFIG_DVB_AV7110_FIRMWARE is not set
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
#
# Supported USB Adapters
================================================================
Index: SOURCES/kernel-ppc.config
diff -u SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.227 SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.228
--- SOURCES/kernel-ppc.config:1.3.2.3.2.2.2.227 Sat Apr 12 23:00:44 2008
+++ SOURCES/kernel-ppc.config Sun Apr 13 00:28:58 2008
@@ -2646,12 +2646,6 @@
CONFIG_UIO_CIF=m
#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
# Library routines
#
CONFIG_BITREVERSE=y
@@ -2675,9 +2669,6 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_AUDIT_GENERIC=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
#
# Kernel hacking
================================================================
Index: SOURCES/kernel-ppc64.config
diff -u SOURCES/kernel-ppc64.config:1.1.2.25 SOURCES/kernel-ppc64.config:1.1.2.26
--- SOURCES/kernel-ppc64.config:1.1.2.25 Sat Apr 12 23:00:44 2008
+++ SOURCES/kernel-ppc64.config Sun Apr 13 00:28:58 2008
@@ -2582,12 +2582,6 @@
CONFIG_UIO_CIF=m
#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
# iSeries device drivers
#
# CONFIG_VIOCONS is not set
@@ -2596,13 +2590,6 @@
# CONFIG_VIOTAPE is not set
#
-# Instrumentation Support
-#
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
-
-#
# Kernel hacking
#
CONFIG_PRINTK_TIME=y
================================================================
Index: SOURCES/kernel-x86_64.config
diff -u SOURCES/kernel-x86_64.config:1.1.2.167 SOURCES/kernel-x86_64.config:1.1.2.168
--- SOURCES/kernel-x86_64.config:1.1.2.167 Sat Apr 12 23:00:44 2008
+++ SOURCES/kernel-x86_64.config Sun Apr 13 00:28:58 2008
@@ -2770,12 +2770,6 @@
CONFIG_UIO=m
CONFIG_UIO_CIF=m
-#
-# Distributed Lock Manager
-#
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
# Firmware Drivers
#
CONFIG_EDD=m
@@ -2784,14 +2778,6 @@
CONFIG_DMIID=y
#
-# Instrumentation Support
-#
-CONFIG_INSTRUMENTATION=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-# CONFIG_KPROBES is not set
-
-#
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
================================================================
Index: SOURCES/kernel-multiarch.config
diff -u SOURCES/kernel-multiarch.config:1.1.2.12 SOURCES/kernel-multiarch.config:1.1.2.13
--- SOURCES/kernel-multiarch.config:1.1.2.12 Sat Apr 12 23:00:44 2008
+++ SOURCES/kernel-multiarch.config Sun Apr 13 00:28:58 2008
@@ -275,6 +275,8 @@
NET_CLS_IND all=y
NET_ESTIMATOR all=y
NET_9P all=m
+NET_9P_FD all=m
+NET_9P_VIRTIO all=m
NET_9P_DEBUG all=n
#
@@ -535,12 +537,14 @@
JFFS2_FS all=m
JFFS2_FS_DEBUG all=0
JFFS2_FS_WRITEBUFFER all=y
+JFFS2_FS_WBUF_VERIFY all=n
JFFS2_SUMMARY all=y
JFFS2_FS_XATTR all=y
JFFS2_FS_POSIX_ACL all=y
JFFS2_FS_SECURITY all=y
JFFS2_COMPRESSION_OPTIONS all=y
JFFS2_ZLIB all=y
+JFFS2_LZO all=y
JFFS2_RTIME all=y
JFFS2_RUBIN all=y
JFFS2_CMODE_NONE all=n
@@ -559,6 +563,7 @@
#
# Network File Systems
#
+NETWORK_FILESYSTEMS all=y
NFS_FS all=m
NFS_V3 all=y
NFS_V3_ACL all=y
@@ -678,6 +683,13 @@
NLS_KOI8_R all=m
NLS_KOI8_U all=m
NLS_UTF8 all=m
+DLM all=m
+DLM_DEBUG all=n
+INSTRUMENTATION all=y
+PROFILING all=y
+OPROFILE all=m
+KPROBES all=n
+MARKERS all=n
#
# Security options
@@ -692,6 +704,8 @@
SECURITY_NETWORK all=y
SECURITY_NETWORK_XFRM all=y
SECURITY_CAPABILITIES all=y
+SECURITY_FILE_CAPABILITIES all=y
+SECURITY_ROOTPLUG all=n
SECURITY_SELINUX all=y
SECURITY_SELINUX_BOOTPARAM all=y
SECURITY_SELINUX_BOOTPARAM_VALUE all=0
@@ -755,6 +769,7 @@
CRYPTO_CAMELLIA all=m
CRYPTO_TEST all=m
CRYPTO_AUTHENC all=m
+CRYPTO_HW all=y
#
# LED drivers
@@ -791,7 +806,7 @@
CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n
CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
-X86_P4_CLOCKMOD all=m
+X86_P4_CLOCKMOD i386=m
CPU_IDLE all=n
DMAR all=n
@@ -805,7 +820,6 @@
BT_HCIUART_LL all=y
NL80211 all=y
-NET_9P_FD all=m
UEVENT_HELPER_PATH all="/sbin/hotplug"
@@ -823,7 +837,7 @@
SCSI_ADVANSYS all=m
SCSI_ARCMSR_AER all=y
-PATA_ACPI all=m
+PATA_ACPI i386=m ia64=m
PATA_NS87415 all=m
DM_MULTIPATH_HP all=m
@@ -929,34 +943,25 @@
QUOTA_NETLINK_INTERFACE all=y
PRINT_QUOTA_WARNING all=y
-JFFS2_FS_WBUF_VERIFY all=n
-JFFS2_LZO all=y
-
-NETWORK_FILESYSTEMS all=y
SUNRPC_XPRT_RDMA all=m
PPC_BESTCOMM ppc=m
PPC_BESTCOMM_ATA ppc=m
PPC_BESTCOMM_FEC ppc=m
PPC_BESTCOMM_GEN_BD ppc=m
-FEC_MPC52xx all=m
-FEC_MPC52xx_MDIO all=y
+FEC_MPC52xx ppc=m
+FEC_MPC52xx_MDIO ppc=y
SERIAL_PMACZILOG_TTYS all=n
-MARKERS all=n
-INSTRUMENTATION all=y
-
ENABLE_WARN_DEPRECATED all=y
DEBUG_SG all=n
BOOT_PRINTK_DELAY all=n
SAMPLES all=n
-SECURITY_FILE_CAPABILITIES all=y
-
SCHED_NO_NO_OMIT_FRAME_POINTER all=y
-PARAVIRT_GUEST all=n
+PARAVIRT_GUEST i386=n
PATA_CS5536 all=m
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-i386.config?r1=1.82.10.198&r2=1.82.10.199&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ia64.config?r1=1.1.2.50&r2=1.1.2.51&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-sparc.config?r1=1.37.2.152&r2=1.37.2.153&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-sparc64.config?r1=1.48.2.141&r2=1.48.2.142&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ppc.config?r1=1.3.2.3.2.2.2.227&r2=1.3.2.3.2.2.2.228&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ppc64.config?r1=1.1.2.25&r2=1.1.2.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-x86_64.config?r1=1.1.2.167&r2=1.1.2.168&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-multiarch.config?r1=1.1.2.12&r2=1.1.2.13&f=u
More information about the pld-cvs-commit
mailing list