---- rh-kernel-src/kernel-3.10.0-x86_64.config 2013-12-16 08:05:07.513206660 +0100
-+++ linux-2.6-3.10.0/.config 2013-12-17 10:53:21.232535799 +0100
+--- rh-kernel-src/kernel-3.10.0-x86_64.config 2015-04-05 18:12:54.643110125 +0200
++++ linux-2.6-3.10.0/.config 2015-04-05 18:13:09.244970726 +0200
@@ -1,7 +1,6 @@
-# x86_64
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.10.0 Kernel Configuration
-+# Linux/x86 3.10.0-1-pve Kernel Configuration
++# Linux/x86 3.10.0-8-pve Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
-@@ -283,16 +282,7 @@
+@@ -264,8 +263,8 @@
+ CONFIG_HAVE_CC_STACKPROTECTOR=y
+ CONFIG_CC_STACKPROTECTOR=y
+ # CONFIG_CC_STACKPROTECTOR_NONE is not set
+-# CONFIG_CC_STACKPROTECTOR_REGULAR is not set
+-CONFIG_CC_STACKPROTECTOR_STRONG=y
++CONFIG_CC_STACKPROTECTOR_REGULAR=y
++# CONFIG_CC_STACKPROTECTOR_STRONG is not set
+ CONFIG_HAVE_CONTEXT_TRACKING=y
+ CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+ CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+@@ -289,16 +288,7 @@
# CONFIG_MODULE_FORCE_UNLOAD is not set
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
CONFIG_BLK_DEV_BSG=y
-@@ -1122,10 +1112,10 @@
+@@ -595,9 +585,9 @@
+ CONFIG_CPU_FREQ_GOV_COMMON=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_USERSPACE is not set
+-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+@@ -1146,10 +1136,10 @@
CONFIG_L2TP_V3=y
CONFIG_L2TP_IP=m
CONFIG_L2TP_ETH=m
CONFIG_BRIDGE_IGMP_SNOOPING=y
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_HAVE_NET_DSA=y
-@@ -1133,7 +1123,7 @@
+@@ -1157,7 +1147,7 @@
CONFIG_VLAN_8021Q_GVRP=y
CONFIG_VLAN_8021Q_MVRP=y
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
-@@ -1431,7 +1421,8 @@
+@@ -1456,10 +1446,11 @@
+ # CONFIG_BLK_DEV_UMEM is not set
+ # CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=m
- CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
+-CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
++CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DRBD is not set
+-# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
- # CONFIG_BLK_DEV_NBD is not set
++CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m
CONFIG_BLK_DEV_OSD=m
-@@ -1525,10 +1516,10 @@
+ CONFIG_BLK_DEV_SX8=m
+@@ -1554,10 +1545,10 @@
#
# SCSI support type (disk, tape, CD-ROM)
#
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-@@ -1751,7 +1742,7 @@
+@@ -1775,9 +1766,12 @@
+ CONFIG_MD_RAID456=m
# CONFIG_MD_MULTIPATH is not set
CONFIG_MD_FAULTY=m
- # CONFIG_BCACHE is not set
+-# CONFIG_BCACHE is not set
++CONFIG_BCACHE=m
++# CONFIG_BCACHE_DEBUG is not set
++# CONFIG_BCACHE_EDEBUG is not set
++# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+ 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_BIO_PRISON=m
-@@ -4529,7 +4520,11 @@
+@@ -1863,7 +1857,7 @@
+ # CAIF transport drivers
+ #
+ CONFIG_VHOST_NET=m
+-# CONFIG_VHOST_SCSI is not set
++CONFIG_VHOST_SCSI=m
+ CONFIG_VHOST_RING=m
+
+ #
+@@ -1970,7 +1964,8 @@
+ CONFIG_MYRI10GE_DCA=y
+ # CONFIG_FEALNX is not set
+ # CONFIG_NET_VENDOR_NATSEMI is not set
+-# CONFIG_NET_VENDOR_NVIDIA is not set
++CONFIG_NET_VENDOR_NVIDIA=y
++CONFIG_FORCEDETH=m
+ CONFIG_NET_VENDOR_OKI=y
+ CONFIG_PCH_GBE=m
+ CONFIG_ETHOC=m
+@@ -4377,7 +4372,7 @@
+ CONFIG_VFIO_IOMMU_TYPE1=m
+ CONFIG_VFIO=m
+ CONFIG_VFIO_PCI=m
+-# CONFIG_VFIO_PCI_VGA is not set
++CONFIG_VFIO_PCI_VGA=y
+ # CONFIG_VIRT_DRIVERS is not set
+ CONFIG_VIRTIO=m
+
+@@ -4596,7 +4591,11 @@
# CONFIG_JBD2_DEBUG is not set
CONFIG_FS_MBCACHE=m
# CONFIG_REISERFS_FS is not set
CONFIG_XFS_FS=m
CONFIG_XFS_QUOTA=y
CONFIG_XFS_POSIX_ACL=y
-@@ -4618,8 +4613,8 @@
+@@ -4686,8 +4685,8 @@
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-@@ -4754,7 +4749,7 @@
+@@ -4824,7 +4823,7 @@
CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m
CONFIG_DLM_DEBUG=y
-@@ -5049,7 +5044,7 @@
+@@ -5017,29 +5016,30 @@
+ CONFIG_KEYS=y
+ CONFIG_PERSISTENT_KEYRINGS=y
+ CONFIG_BIG_KEYS=y
+-CONFIG_TRUSTED_KEYS=y
+-CONFIG_ENCRYPTED_KEYS=y
++CONFIG_TRUSTED_KEYS=m
++CONFIG_ENCRYPTED_KEYS=m
+ CONFIG_KEYS_DEBUG_PROC_KEYS=y
+ # CONFIG_SECURITY_DMESG_RESTRICT is not set
+ CONFIG_SECURITY=y
+ CONFIG_SECURITYFS=y
+ CONFIG_SECURITY_NETWORK=y
+ CONFIG_SECURITY_NETWORK_XFRM=y
+-# CONFIG_SECURITY_PATH is not set
++CONFIG_SECURITY_PATH=y
+ CONFIG_SECURITY_SECURELEVEL=y
+ CONFIG_INTEL_TXT=y
+ CONFIG_LSM_MMAP_MIN_ADDR=65535
+ CONFIG_SECURITY_SELINUX=y
+-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+-CONFIG_SECURITY_SELINUX_DISABLE=y
++# CONFIG_SECURITY_SELINUX_BOOTPARAM is not set
++# CONFIG_SECURITY_SELINUX_DISABLE is not set
+ CONFIG_SECURITY_SELINUX_DEVELOP=y
+ CONFIG_SECURITY_SELINUX_AVC_STATS=y
+ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+ # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+ # CONFIG_SECURITY_SMACK is not set
+ # CONFIG_SECURITY_TOMOYO is not set
+-# CONFIG_SECURITY_APPARMOR is not set
++CONFIG_SECURITY_APPARMOR=y
++CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
++CONFIG_SECURITY_APPARMOR_COMPAT_24=y
+ # CONFIG_SECURITY_YAMA is not set
+ CONFIG_INTEGRITY=y
+ CONFIG_INTEGRITY_SIGNATURE=y
+@@ -5050,11 +5050,10 @@
+ CONFIG_IMA_LSM_RULES=y
+ CONFIG_IMA_APPRAISE=y
+ CONFIG_IMA_TRUSTED_KEYRING=y
+-CONFIG_EVM=y
+-CONFIG_EVM_HMAC_VERSION=2
+-CONFIG_DEFAULT_SECURITY_SELINUX=y
++# CONFIG_DEFAULT_SECURITY_SELINUX is not set
++CONFIG_DEFAULT_SECURITY_APPARMOR=y
+ # CONFIG_DEFAULT_SECURITY_DAC is not set
+-CONFIG_DEFAULT_SECURITY="selinux"
++CONFIG_DEFAULT_SECURITY="apparmor"
+ CONFIG_XOR_BLOCKS=m
+ CONFIG_ASYNC_CORE=m
+ CONFIG_ASYNC_MEMCPY=m
+@@ -5066,7 +5065,6 @@
+ #
+ # Crypto core or helper
+ #
+-CONFIG_CRYPTO_FIPS=y
+ CONFIG_CRYPTO_ALGAPI=y
+ CONFIG_CRYPTO_ALGAPI2=y
+ CONFIG_CRYPTO_AEAD=y
+@@ -5126,7 +5124,7 @@
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
-@@ -5161,7 +5156,7 @@
- CONFIG_PERCPU_RWSEM=y
+@@ -5252,7 +5250,7 @@
+ CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
-CONFIG_CRC_T10DIF=m
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
-@@ -5208,6 +5203,7 @@
+@@ -5301,6 +5299,7 @@
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
projects / pve-kernel-3.10.0.git / blobdiff