include cephfs module

[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 1c4da041b83858228182fb961f68b9f0f59b3bb2..b42a9c0d9e33a442f07a6fc8f282458cc445cad6 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  2014-06-13 09:32:05.616074844 +0200
-+++ linux-2.6-3.10.0/.config   2014-06-22 15:01:45.753338384 +0200
+--- rh-kernel-src/kernel-3.10.0-x86_64.config  2014-12-05 13:19:29.000000000 +0100
++++ config-3.10.0      2014-12-16 14:21:56.000000000 +0100
 @@ -1,7 +1,6 @@
 -# x86_64
  #
@@ -9,7 +9,7 @@
  #
  CONFIG_64BIT=y
  CONFIG_X86_64=y
-@@ -262,8 +261,8 @@
+@@ -263,8 +262,8 @@
  CONFIG_HAVE_CC_STACKPROTECTOR=y
  CONFIG_CC_STACKPROTECTOR=y
  # CONFIG_CC_STACKPROTECTOR_NONE is not set
@@ -20,7 +20,7 @@
  CONFIG_HAVE_CONTEXT_TRACKING=y
  CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
  CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
-@@ -287,16 +286,7 @@
+@@ -288,16 +287,7 @@
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  CONFIG_MODVERSIONS=y
  CONFIG_MODULE_SRCVERSION_ALL=y
@@ -38,7 +38,7 @@
  CONFIG_STOP_MACHINE=y
  CONFIG_BLOCK=y
  CONFIG_BLK_DEV_BSG=y
-@@ -588,9 +578,9 @@
+@@ -589,9 +579,9 @@
  CONFIG_CPU_FREQ_GOV_COMMON=y
  CONFIG_CPU_FREQ_STAT=m
  CONFIG_CPU_FREQ_STAT_DETAILS=y
@@ -50,7 +50,7 @@
  # 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 @@
+@@ -1129,10 +1119,10 @@
  CONFIG_L2TP_V3=y
  CONFIG_L2TP_IP=m
  CONFIG_L2TP_ETH=m
@@ -63,7 +63,7 @@
  CONFIG_BRIDGE_IGMP_SNOOPING=y
  CONFIG_BRIDGE_VLAN_FILTERING=y
  CONFIG_HAVE_NET_DSA=y
-@@ -1139,7 +1129,7 @@
+@@ -1140,7 +1130,7 @@
  CONFIG_VLAN_8021Q_GVRP=y
  CONFIG_VLAN_8021Q_MVRP=y
  # CONFIG_DECNET is not set
@@ -72,7 +72,7 @@
  # CONFIG_LLC2 is not set
  # CONFIG_IPX is not set
  # CONFIG_ATALK is not set
-@@ -1302,7 +1292,9 @@
+@@ -1303,7 +1293,9 @@
  CONFIG_RFKILL_INPUT=y
  # CONFIG_NET_9P is not set
  # CONFIG_CAIF is not set
@@ -83,7 +83,7 @@
  # CONFIG_NFC is not set
  CONFIG_HAVE_BPF_JIT=y
  
-@@ -1435,10 +1427,11 @@
+@@ -1436,10 +1428,11 @@
  # CONFIG_BLK_DEV_UMEM is not set
  # CONFIG_BLK_DEV_COW_COMMON is not set
  CONFIG_BLK_DEV_LOOP=m
@@ -98,7 +98,7 @@
  CONFIG_BLK_DEV_NVME=m
  CONFIG_BLK_DEV_OSD=m
  CONFIG_BLK_DEV_SX8=m
-@@ -1453,7 +1446,7 @@
+@@ -1454,7 +1447,7 @@
  CONFIG_XEN_BLKDEV_FRONTEND=m
  CONFIG_VIRTIO_BLK=m
  # CONFIG_BLK_DEV_HD is not set
@@ -107,7 +107,7 @@
  # CONFIG_BLK_DEV_RSXX is not set
  
  #
-@@ -1531,10 +1524,10 @@
+@@ -1532,10 +1525,10 @@
  #
  # SCSI support type (disk, tape, CD-ROM)
  #
@@ -120,7 +120,7 @@
  CONFIG_BLK_DEV_SR_VENDOR=y
  CONFIG_CHR_DEV_SG=m
  CONFIG_CHR_DEV_SCH=m
-@@ -1752,9 +1745,12 @@
+@@ -1753,9 +1746,12 @@
  CONFIG_MD_RAID456=m
  # CONFIG_MD_MULTIPATH is not set
  CONFIG_MD_FAULTY=m
@@ -135,7 +135,7 @@
  CONFIG_DM_DEBUG=y
  CONFIG_DM_BUFIO=m
  CONFIG_DM_BIO_PRISON=m
-@@ -4326,7 +4322,7 @@
+@@ -4327,7 +4323,7 @@
  CONFIG_VFIO_IOMMU_TYPE1=m
  CONFIG_VFIO=m
  CONFIG_VFIO_PCI=m
@@ -144,7 +144,7 @@
  # CONFIG_VIRT_DRIVERS is not set
  CONFIG_VIRTIO=m
  
-@@ -4542,7 +4538,11 @@
+@@ -4543,7 +4539,11 @@
  # CONFIG_JBD2_DEBUG is not set
  CONFIG_FS_MBCACHE=m
  # CONFIG_REISERFS_FS is not set
@@ -157,7 +157,7 @@
  CONFIG_XFS_FS=m
  CONFIG_XFS_QUOTA=y
  CONFIG_XFS_POSIX_ACL=y
-@@ -4631,8 +4631,8 @@
+@@ -4632,8 +4632,8 @@
  # CONFIG_ADFS_FS is not set
  # CONFIG_AFFS_FS is not set
  # CONFIG_ECRYPT_FS is not set
@@ -168,7 +168,16 @@
  # CONFIG_BEFS_FS is not set
  # CONFIG_BFS_FS is not set
  # CONFIG_EFS_FS is not set
-@@ -4769,7 +4769,7 @@
+@@ -4703,7 +4703,7 @@
+ CONFIG_SUNRPC_DEBUG=y
+ CONFIG_SUNRPC_XPRT_RDMA_CLIENT=m
+ # CONFIG_SUNRPC_XPRT_RDMA_SERVER is not set
+-# CONFIG_CEPH_FS is not set
++CONFIG_CEPH_FS=m
+ CONFIG_CIFS=m
+ CONFIG_CIFS_STATS=y
+ # CONFIG_CIFS_STATS2 is not set
+@@ -4770,7 +4770,7 @@
  CONFIG_NLS_MAC_INUIT=m
  CONFIG_NLS_MAC_ROMANIAN=m
  CONFIG_NLS_MAC_TURKISH=m
@@ -177,7 +186,7 @@
  CONFIG_DLM=m
  CONFIG_DLM_DEBUG=y
  
-@@ -4958,8 +4958,8 @@
+@@ -4959,8 +4959,8 @@
  CONFIG_KEYS=y
  CONFIG_PERSISTENT_KEYRINGS=y
  CONFIG_BIG_KEYS=y
@@ -188,7 +197,7 @@
  CONFIG_KEYS_DEBUG_PROC_KEYS=y
  # CONFIG_SECURITY_DMESG_RESTRICT is not set
  CONFIG_SECURITY=y
-@@ -4971,9 +4971,8 @@
+@@ -4972,9 +4972,8 @@
  CONFIG_INTEL_TXT=y
  CONFIG_LSM_MMAP_MIN_ADDR=65535
  CONFIG_SECURITY_SELINUX=y
@@ -200,7 +209,7 @@
  CONFIG_SECURITY_SELINUX_DEVELOP=y
  CONFIG_SECURITY_SELINUX_AVC_STATS=y
  CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
-@@ -4990,11 +4989,9 @@
+@@ -4991,11 +4990,9 @@
  CONFIG_IMA_AUDIT=y
  CONFIG_IMA_LSM_RULES=y
  CONFIG_IMA_APPRAISE=y
@@ -215,7 +224,7 @@
  CONFIG_XOR_BLOCKS=m
  CONFIG_ASYNC_CORE=m
  CONFIG_ASYNC_MEMCPY=m
-@@ -5066,7 +5063,7 @@
+@@ -5067,7 +5064,7 @@
  CONFIG_CRYPTO_CRC32C_INTEL=m
  CONFIG_CRYPTO_CRC32=m
  CONFIG_CRYPTO_CRC32_PCLMUL=m
@@ -224,7 +233,7 @@
  CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
  CONFIG_CRYPTO_GHASH=m
  CONFIG_CRYPTO_MD4=m
-@@ -5180,7 +5177,7 @@
+@@ -5181,7 +5178,7 @@
  CONFIG_CMPXCHG_LOCKREF=y
  CONFIG_CRC_CCITT=m
  CONFIG_CRC16=y
@@ -233,7 +242,7 @@
  CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC32_SELFTEST is not set
-@@ -5227,6 +5224,7 @@
+@@ -5228,6 +5225,7 @@
  CONFIG_DQL=y
  CONFIG_NLATTR=y
  CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y