---- rh-kernel-src/kernel-3.10.0-x86_64.config 2013-12-16 08:05:07.000000000 +0100
-+++ config-3.10.0 2014-04-10 08:36:55.000000000 +0200
+--- rh-kernel-src/kernel-3.10.0-x86_64.config 2016-12-18 14:59:46.000000000 +0100
++++ config-3.10.0.new 2016-12-18 15:14:10.000000000 +0100
@@ -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 @@
+@@ -274,8 +273,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
+@@ -302,16 +301,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
-@@ -583,9 +573,9 @@
+@@ -621,9 +611,9 @@
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_STAT=m
CONFIG_CPU_FREQ_STAT_DETAILS=y
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-@@ -1122,10 +1112,10 @@
+@@ -1195,10 +1185,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 @@
+@@ -1206,7 +1196,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 @@
+@@ -1594,10 +1584,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_NVME=m
++CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_OSD=m
-@@ -1525,10 +1516,10 @@
+ CONFIG_BLK_DEV_SX8=m
+ CONFIG_BLK_DEV_RAM=m
+@@ -1702,10 +1693,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 @@
+@@ -1922,9 +1913,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_MQ_DEFAULT is not set
CONFIG_DM_DEBUG=y
CONFIG_DM_BUFIO=m
- CONFIG_DM_BIO_PRISON=m
-@@ -4529,7 +4520,11 @@
+@@ -2015,7 +2009,7 @@
+ # CAIF transport drivers
+ #
+ CONFIG_VHOST_NET=m
+-# CONFIG_VHOST_SCSI is not set
++CONFIG_VHOST_SCSI=m
+ CONFIG_VHOST_RING=m
+ CONFIG_VHOST=m
+ # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+@@ -2140,7 +2134,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
+@@ -4860,7 +4855,7 @@
+ CONFIG_VFIO=m
+ CONFIG_VFIO_NOIOMMU=y
+ CONFIG_VFIO_PCI=m
+-# CONFIG_VFIO_PCI_VGA is not set
++CONFIG_VFIO_PCI_VGA=y
+ CONFIG_VFIO_PCI_MMAP=y
+ CONFIG_VFIO_PCI_INTX=y
+ CONFIG_IRQ_BYPASS_MANAGER=m
+@@ -5105,7 +5100,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 @@
+@@ -5196,8 +5195,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 @@
+@@ -5340,7 +5339,7 @@
CONFIG_NLS_MAC_INUIT=m
CONFIG_NLS_MAC_ROMANIAN=m
CONFIG_NLS_MAC_TURKISH=m
CONFIG_DLM=m
CONFIG_DLM_DEBUG=y
-@@ -4956,9 +4951,8 @@
+@@ -5537,8 +5536,8 @@
+ 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
+@@ -5550,9 +5549,8 @@
CONFIG_INTEL_TXT=y
CONFIG_LSM_MMAP_MIN_ADDR=65535
CONFIG_SECURITY_SELINUX=y
CONFIG_SECURITY_SELINUX_DEVELOP=y
CONFIG_SECURITY_SELINUX_AVC_STATS=y
CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-@@ -4975,9 +4969,9 @@
- CONFIG_IMA_AUDIT=y
- CONFIG_IMA_LSM_RULES=y
- # CONFIG_IMA_APPRAISE is not set
--CONFIG_DEFAULT_SECURITY_SELINUX=y
+@@ -5573,8 +5571,9 @@
+ CONFIG_EVM=y
+ CONFIG_EVM_HMAC_VERSION=2
+ CONFIG_DEFAULT_SECURITY_SELINUX=y
-# CONFIG_DEFAULT_SECURITY_DAC is not set
-CONFIG_DEFAULT_SECURITY="selinux"
-+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
++#CONFIG_DEFAULT_SECURITY="selinux"
CONFIG_XOR_BLOCKS=m
CONFIG_ASYNC_CORE=m
CONFIG_ASYNC_MEMCPY=m
-@@ -5049,7 +5043,7 @@
+@@ -5650,7 +5649,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 +5155,7 @@
- CONFIG_PERCPU_RWSEM=y
+@@ -5785,7 +5784,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 +5202,7 @@
- CONFIG_DQL=y
- CONFIG_NLATTR=y
- CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
-+CONFIG_LRU_CACHE=m
- CONFIG_AVERAGE=y
- CONFIG_CLZ_TAB=y
- CONFIG_CORDIC=m
projects / pve-kernel-3.10.0.git / blobdiff