---- rh-kernel-src/kernel-3.10.0-x86_64.config 2014-04-23 09:14:23.000000000 +0200
-+++ config-3.10.0 2014-04-24 10:28:36.000000000 +0200
+--- rh-kernel-src/kernel-3.10.0-x86_64.config 2015-03-14 10:29:17.996963858 +0100
++++ config-3.10.0.new 2015-03-14 11:28:50.364833361 +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
-@@ -262,8 +261,8 @@
+@@ -264,8 +263,8 @@
CONFIG_HAVE_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR=y
# CONFIG_CC_STACKPROTECTOR_NONE is not set
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-@@ -287,16 +286,7 @@
+@@ -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
-@@ -588,9 +578,9 @@
+@@ -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_CONSERVATIVE is not set
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-@@ -1128,10 +1118,10 @@
+@@ -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
-@@ -1139,7 +1129,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
-@@ -1303,6 +1293,9 @@
- # CONFIG_NET_9P is not set
- # CONFIG_CAIF is not set
- # CONFIG_CEPH_LIB is not set
-+CONFIG_CEPH_LIB=m
-+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
-+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
- # CONFIG_NFC is not set
- CONFIG_HAVE_BPF_JIT=y
-
-@@ -1435,10 +1428,11 @@
+@@ -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_NVME=m
CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m
-@@ -1453,7 +1447,7 @@
- CONFIG_XEN_BLKDEV_FRONTEND=m
- CONFIG_VIRTIO_BLK=m
- # CONFIG_BLK_DEV_HD is not set
--# CONFIG_BLK_DEV_RBD is not set
-+CONFIG_BLK_DEV_RBD=m
- # CONFIG_BLK_DEV_RSXX is not set
-
- #
-@@ -1531,10 +1525,10 @@
+@@ -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
-@@ -1754,7 +1748,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
-@@ -4542,7 +4536,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
-@@ -4631,8 +4629,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
-@@ -4769,7 +4767,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
-@@ -4958,8 +4956,8 @@
+@@ -5017,8 +5016,8 @@
CONFIG_KEYS=y
CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y
CONFIG_KEYS_DEBUG_PROC_KEYS=y
# CONFIG_SECURITY_DMESG_RESTRICT is not set
CONFIG_SECURITY=y
-@@ -4971,9 +4969,8 @@
+@@ -5030,9 +5029,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
-@@ -4992,9 +4989,9 @@
- CONFIG_IMA_APPRAISE=y
+@@ -5053,8 +5051,9 @@
CONFIG_EVM=y
CONFIG_EVM_HMAC_VERSION=2
--CONFIG_DEFAULT_SECURITY_SELINUX=y
+ 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
-@@ -5066,7 +5063,7 @@
+@@ -5126,7 +5125,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
-@@ -5180,7 +5177,7 @@
+@@ -5252,7 +5251,7 @@
CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
-@@ -5227,6 +5224,7 @@
+@@ -5301,6 +5300,7 @@
CONFIG_DQL=y
CONFIG_NLATTR=y
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
projects / pve-kernel-3.10.0.git / blobdiff