---- config-2.6.32-042stab074.10.x86_64 2013-03-04 18:44:35.000000000 +0100
-+++ config-2.6.32 2013-03-08 11:01:45.000000000 +0100
-@@ -210,7 +210,7 @@
+--- config-2.6.32-042stab112.15.x86_64 2015-10-24 17:15:38.000000000 +0200
++++ linux-2.6-2.6.32/.config 2015-10-27 08:25:22.000000000 +0100
+@@ -216,8 +216,7 @@
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_VERIFY_ELF=y
-CONFIG_MODULE_SIG=y
+-# CONFIG_MODULE_SIG_FORCE is not set
+# CONFIG_MODULE_SIG is not set
- # CONFIG_MODULE_SIG_FORCE is not set
CONFIG_MODULE_VERIFY=y
CONFIG_STOP_MACHINE=y
-@@ -946,8 +946,8 @@
+ CONFIG_BLOCK=y
+@@ -237,10 +236,10 @@
+ CONFIG_IOSCHED_CFQ=y
+ CONFIG_CFQ_GROUP_IOSCHED=y
+ # CONFIG_DEFAULT_AS is not set
+-# CONFIG_DEFAULT_DEADLINE is not set
+-CONFIG_DEFAULT_CFQ=y
++CONFIG_DEFAULT_DEADLINE=y
++# CONFIG_DEFAULT_CFQ is not set
+ # CONFIG_DEFAULT_NOOP is not set
+-CONFIG_DEFAULT_IOSCHED="cfq"
++CONFIG_DEFAULT_IOSCHED="deadline"
+ CONFIG_PREEMPT_NOTIFIERS=y
+ CONFIG_FREEZER=y
+
+@@ -494,9 +493,9 @@
+ CONFIG_CPU_FREQ_DEBUG=y
+ CONFIG_CPU_FREQ_STAT=m
+ CONFIG_CPU_FREQ_STAT_DETAILS=y
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
++CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+@@ -687,7 +686,7 @@
+ # CONFIG_DEFAULT_RENO is not set
+ CONFIG_DEFAULT_TCP_CONG="cubic"
+ CONFIG_TCP_MD5SIG=y
+-CONFIG_IPV6=m
++CONFIG_IPV6=y
+ CONFIG_IPV6_PRIVACY=y
+ CONFIG_IPV6_ROUTER_PREF=y
+ CONFIG_IPV6_ROUTE_INFO=y
+@@ -967,9 +966,9 @@
+ # CONFIG_ATM_MPOA is not set
+ CONFIG_ATM_BR2684=m
# CONFIG_ATM_BR2684_IPFILTER is not set
- CONFIG_STP=m
+-CONFIG_STP=m
++CONFIG_STP=y
CONFIG_GARP=m
-CONFIG_BRIDGE=m
+CONFIG_BRIDGE=y
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_NET_DSA=y
CONFIG_NET_DSA_TAG_DSA=y
- CONFIG_NET_DSA_TAG_EDSA=y
-@@ -1364,10 +1364,10 @@
+@@ -983,7 +982,7 @@
+ CONFIG_VLAN_8021Q=m
+ CONFIG_VLAN_8021Q_GVRP=y
+ # CONFIG_DECNET is not set
+-CONFIG_LLC=m
++CONFIG_LLC=y
+ # CONFIG_LLC2 is not set
+ # CONFIG_IPX is not set
+ # CONFIG_ATALK is not set
+@@ -1401,10 +1400,10 @@
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-@@ -1444,7 +1444,7 @@
+@@ -1440,7 +1439,7 @@
+ CONFIG_SCSI_HPSA=m
+ CONFIG_SCSI_3W_9XXX=m
+ CONFIG_SCSI_3W_SAS=m
+-# CONFIG_SCSI_ACARD is not set
++CONFIG_SCSI_ACARD=m
+ CONFIG_SCSI_AACRAID=m
+ CONFIG_SCSI_AIC7XXX=m
+ CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+@@ -1486,7 +1485,7 @@
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
CONFIG_SCSI_ISCI=m
CONFIG_SCSI_IPS=m
CONFIG_SCSI_INITIO=m
-@@ -1562,7 +1562,7 @@
- # CONFIG_MULTICORE_RAID456 is not set
+@@ -1605,7 +1604,7 @@
# CONFIG_MD_MULTIPATH is not set
CONFIG_MD_FAULTY=m
+ CONFIG_BLK_DEV_DM_BUILTIN=y
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
CONFIG_DM_DEBUG=y
CONFIG_DM_BUFIO=m
- CONFIG_DM_PERSISTENT_DATA=m
-@@ -3169,7 +3169,11 @@
- # CONFIG_LOGO_LINUX_MONO is not set
+ CONFIG_DM_BIO_PRISON=m
+@@ -3360,6 +3359,11 @@
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
--CONFIG_LOGO_PSBM_CLUT224=y
-+# CONFIG_LOGO_PSBM_CLUT224 is not set
+ CONFIG_LOGO_PSBM_CLUT224=y
++
+#
+# Bootsplash configuration
+#
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -3772,7 +3776,9 @@
+@@ -3985,7 +3989,9 @@
# CONFIG_SLICOSS is not set
# CONFIG_VIDEO_GO7007 is not set
# CONFIG_VIDEO_CX25821 is not set
# CONFIG_W35UND is not set
# CONFIG_PRISM2_USB is not set
# CONFIG_ECHO is not set
-@@ -3904,7 +3910,11 @@
+@@ -4109,7 +4115,11 @@
CONFIG_REISERFS_FS_XATTR=y
CONFIG_REISERFS_FS_POSIX_ACL=y
CONFIG_REISERFS_FS_SECURITY=y
CONFIG_FS_POSIX_ACL=y
CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
-@@ -3992,8 +4002,8 @@
+@@ -4199,8 +4209,8 @@
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
CONFIG_ECRYPT_FS=m
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-@@ -4140,7 +4150,7 @@
+@@ -4348,7 +4358,7 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_ENABLE_WARN_DEPRECATED is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=2048
-@@ -4184,7 +4194,7 @@
+@@ -4393,7 +4403,7 @@
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VIRTUAL is not set
# CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4415,8 +4425,8 @@
+@@ -4526,7 +4536,6 @@
#
- CONFIG_CRYPTO_ANSI_CPRNG=m
+ # Crypto core or helper
+ #
+-CONFIG_CRYPTO_FIPS=y
+ CONFIG_CRYPTO_ALGAPI=y
+ CONFIG_CRYPTO_ALGAPI2=y
+ CONFIG_CRYPTO_AEAD=m
+@@ -4640,8 +4649,7 @@
+ CONFIG_CRYPTO_DRBG_CTR=y
+ CONFIG_CRYPTO_DRBG=m
CONFIG_CRYPTO_MPILIB=y
-CONFIG_CRYPTO_SIGNATURE=y
-CONFIG_CRYPTO_SIGNATURE_DSA=y
+# CONFIG_CRYPTO_SIGNATURE is not set
-+# CONFIG_CRYPTO_SIGNATURE_DSA is not set
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_DEV_PADLOCK=m
CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+@@ -4674,7 +4682,7 @@
+ CONFIG_GENERIC_FIND_LAST_BIT=y
+ CONFIG_CRC_CCITT=m
+ CONFIG_CRC16=y
+-CONFIG_CRC_T10DIF=m
++CONFIG_CRC_T10DIF=y
+ CONFIG_CRC_ITU_T=m
+ CONFIG_CRC32=y
+ # CONFIG_CRC32_SELFTEST is not set
projects / pve-kernel-2.6.32.git / blobdiff