add download target (from vault.centos.org)

[pve-kernel-3.10.0.git] / config-3.10.0.diff

diff --git a/config-3.10.0.diff b/config-3.10.0.diff
index 013a84fd74311ae8aae213b39037cfbdbd65cfc8..1c4da041b83858228182fb961f68b9f0f59b3bb2 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -1,11 +1,11 @@
---- rh-kernel-src/kernel-3.10.0-x86_64.config  2014-04-23 09:14:23.000000000 +0200
-+++ config-3.10.0      2014-04-23 09:52:16.000000000 +0200
+--- rh-kernel-src/kernel-3.10.0-x86_64.config  2014-06-13 09:32:05.616074844 +0200
++++ linux-2.6-3.10.0/.config   2014-06-22 15:01:45.753338384 +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-2-pve Kernel Configuration
  #
  CONFIG_64BIT=y
  CONFIG_X86_64=y
@@ -72,17 +72,42 @@
  # CONFIG_LLC2 is not set
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
-@@ -1437,7 +1427,8 @@
+@@ -1302,7 +1292,9 @@
+ CONFIG_RFKILL_INPUT=y
+ # 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 +1427,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
-@@ -1531,10 +1522,10 @@
+ CONFIG_BLK_DEV_SX8=m
+@@ -1453,7 +1446,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 +1524,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -95,16 +120,31 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1754,7 +1745,7 @@
+@@ -1752,9 +1745,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 +4533,11 @@
+@@ -4326,7 +4322,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
+ 
+@@ -4542,7 +4538,11 @@
  # CONFIG_JBD2_DEBUG is not set
  CONFIG_FS_MBCACHE=m
  # CONFIG_REISERFS_FS is not set
@@ -117,7 +157,7 @@
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
  CONFIG_XFS_POSIX_ACL=y
-@@ -4631,8 +4626,8 @@
+@@ -4631,8 +4631,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_ECRYPT_FS is not set
@@ -128,7 +168,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4769,7 +4764,7 @@
+@@ -4769,7 +4769,7 @@
  CONFIG_NLS_MAC_INUIT=m
  CONFIG_NLS_MAC_ROMANIAN=m
  CONFIG_NLS_MAC_TURKISH=m
@@ -137,7 +177,7 @@
  CONFIG_DLM=m
  CONFIG_DLM_DEBUG=y
  
-@@ -4958,8 +4953,8 @@
+@@ -4958,8 +4958,8 @@
  CONFIG_KEYS=y
  CONFIG_PERSISTENT_KEYRINGS=y
  CONFIG_BIG_KEYS=y
@@ -148,7 +188,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  # CONFIG_SECURITY_DMESG_RESTRICT is not set
  CONFIG_SECURITY=y
-@@ -4971,9 +4966,8 @@
+@@ -4971,9 +4971,8 @@
  CONFIG_INTEL_TXT=y
  CONFIG_LSM_MMAP_MIN_ADDR=65535
  CONFIG_SECURITY_SELINUX=y
@@ -160,10 +200,12 @@
  CONFIG_SECURITY_SELINUX_DEVELOP=y
  CONFIG_SECURITY_SELINUX_AVC_STATS=y
  CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-@@ -4992,9 +4986,9 @@
+@@ -4990,11 +4989,9 @@
+ CONFIG_IMA_AUDIT=y
+ CONFIG_IMA_LSM_RULES=y
  CONFIG_IMA_APPRAISE=y
- CONFIG_EVM=y
- CONFIG_EVM_HMAC_VERSION=2
+-CONFIG_EVM=y
+-CONFIG_EVM_HMAC_VERSION=2
 -CONFIG_DEFAULT_SECURITY_SELINUX=y
 -# CONFIG_DEFAULT_SECURITY_DAC is not set
 -CONFIG_DEFAULT_SECURITY="selinux"
@@ -173,7 +215,7 @@
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
-@@ -5066,7 +5060,7 @@
+@@ -5066,7 +5063,7 @@
  CONFIG_CRYPTO_CRC32C_INTEL=m
  CONFIG_CRYPTO_CRC32=m
  CONFIG_CRYPTO_CRC32_PCLMUL=m
@@ -182,7 +224,7 @@
  CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
  CONFIG_CRYPTO_GHASH=m
  CONFIG_CRYPTO_MD4=m
-@@ -5180,7 +5174,7 @@
+@@ -5180,7 +5177,7 @@
  CONFIG_CMPXCHG_LOCKREF=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
@@ -191,7 +233,7 @@
  CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC32_SELFTEST is not set
-@@ -5227,6 +5221,7 @@
+@@ -5227,6 +5224,7 @@
  CONFIG_DQL=y
  CONFIG_NLATTR=y
  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y