update to kernel-3.10.0-121.el7.src.rpm

[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 1752e99a2e522221257c7be2ff67b0592e03a6ca..013a84fd74311ae8aae213b39037cfbdbd65cfc8 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -1,5 +1,5 @@
---- 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  2014-04-23 09:14:23.000000000 +0200
++++ config-3.10.0      2014-04-23 09:52:16.000000000 +0200
 @@ -1,7 +1,6 @@
 -# x86_64
  #
@@ -9,7 +9,18 @@
  #
  CONFIG_64BIT=y
  CONFIG_X86_64=y
-@@ -283,16 +282,7 @@
+@@ -262,8 +261,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
+@@ -287,16 +286,7 @@
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
@@ -27,7 +38,7 @@
  CONFIG_STOP_MACHINE=y
  CONFIG_BLOCK=y
  CONFIG_BLK_DEV_BSG=y
-@@ -583,9 +573,9 @@
+@@ -588,9 +578,9 @@
  CONFIG_CPU_FREQ_GOV_COMMON=y
  CONFIG_CPU_FREQ_STAT=m
  CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -39,7 +50,7 @@
  # 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 @@
+@@ -1128,10 +1118,10 @@
  CONFIG_L2TP_V3=y
  CONFIG_L2TP_IP=m
  CONFIG_L2TP_ETH=m
@@ -52,7 +63,7 @@
  CONFIG_BRIDGE_IGMP_SNOOPING=y
  CONFIG_BRIDGE_VLAN_FILTERING=y
  CONFIG_HAVE_NET_DSA=y
-@@ -1133,7 +1123,7 @@
+@@ -1139,7 +1129,7 @@
  CONFIG_VLAN_8021Q_GVRP=y
  CONFIG_VLAN_8021Q_MVRP=y
  # CONFIG_DECNET is not set
@@ -61,7 +72,7 @@
  # CONFIG_LLC2 is not set
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
-@@ -1431,7 +1421,8 @@
+@@ -1437,7 +1427,8 @@
  CONFIG_BLK_DEV_LOOP=m
  CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
  # CONFIG_BLK_DEV_CRYPTOLOOP is not set
@@ -71,7 +82,7 @@
  # CONFIG_BLK_DEV_NBD is not set
  CONFIG_BLK_DEV_NVME=m
  CONFIG_BLK_DEV_OSD=m
-@@ -1525,10 +1516,10 @@
+@@ -1531,10 +1522,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -84,16 +95,16 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1751,7 +1742,7 @@
- # CONFIG_MD_MULTIPATH is not set
+@@ -1754,7 +1745,7 @@
  CONFIG_MD_FAULTY=m
  # CONFIG_BCACHE 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 @@
+@@ -4542,7 +4533,11 @@
  # CONFIG_JBD2_DEBUG is not set
  CONFIG_FS_MBCACHE=m
  # CONFIG_REISERFS_FS is not set
@@ -106,7 +117,7 @@
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
  CONFIG_XFS_POSIX_ACL=y
-@@ -4618,8 +4613,8 @@
+@@ -4631,8 +4626,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_ECRYPT_FS is not set
@@ -117,7 +128,7 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4754,7 +4749,7 @@
+@@ -4769,7 +4764,7 @@
  CONFIG_NLS_MAC_INUIT=m
  CONFIG_NLS_MAC_ROMANIAN=m
  CONFIG_NLS_MAC_TURKISH=m
@@ -126,7 +137,18 @@
  CONFIG_DLM=m
  CONFIG_DLM_DEBUG=y
  
-@@ -4956,9 +4951,8 @@
+@@ -4958,8 +4953,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
+@@ -4971,9 +4966,8 @@
  CONFIG_INTEL_TXT=y
  CONFIG_LSM_MMAP_MIN_ADDR=65535
  CONFIG_SECURITY_SELINUX=y
@@ -138,10 +160,10 @@
  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
+@@ -4992,9 +4986,9 @@
+ CONFIG_IMA_APPRAISE=y
+ CONFIG_EVM=y
+ CONFIG_EVM_HMAC_VERSION=2
 -CONFIG_DEFAULT_SECURITY_SELINUX=y
 -# CONFIG_DEFAULT_SECURITY_DAC is not set
 -CONFIG_DEFAULT_SECURITY="selinux"
@@ -151,7 +173,7 @@
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
-@@ -5049,7 +5043,7 @@
+@@ -5066,7 +5060,7 @@
  CONFIG_CRYPTO_CRC32C_INTEL=m
  CONFIG_CRYPTO_CRC32=m
  CONFIG_CRYPTO_CRC32_PCLMUL=m
@@ -160,8 +182,8 @@
  CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
  CONFIG_CRYPTO_GHASH=m
  CONFIG_CRYPTO_MD4=m
-@@ -5161,7 +5155,7 @@
- CONFIG_PERCPU_RWSEM=y
+@@ -5180,7 +5174,7 @@
+ CONFIG_CMPXCHG_LOCKREF=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
 -CONFIG_CRC_T10DIF=m
@@ -169,7 +191,7 @@
  CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC32_SELFTEST is not set
-@@ -5208,6 +5202,7 @@
+@@ -5227,6 +5221,7 @@
  CONFIG_DQL=y
  CONFIG_NLATTR=y
  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y