X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fkernel_configs%2Fkernel-3.12-3.12-sles12-x86_64.config;h=753c11bfe826bdffa972ea46eef4324029bceba3;hb=refs%2Fchanges%2F56%2F25556%2F5;hp=f044fec5fe628c579b83e2a7012dea03f5b48d42;hpb=0f62ba942939c26edf07176d2eb082d38e95caec;p=fs%2Flustre-release.git

diff --git a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
index f044fec..753c11b 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-3.12-3.12-sles12-x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.57 Kernel Configuration
+# Linux/x86 3.12.69 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-60.35-default"
+CONFIG_LOCALVERSION="-60.64.32-default"
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
@@ -521,8 +521,7 @@ CONFIG_HZ=250
 CONFIG_SCHED_HRTICK=y
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
-CONFIG_KEXEC_VERIFY_SIG=y
-CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+# CONFIG_KEXEC_VERIFY_SIG is not set
 CONFIG_CRASH_DUMP=y
 # CONFIG_KEXEC_JUMP is not set
 CONFIG_PHYSICAL_START=0x200000
@@ -1686,7 +1685,7 @@ CONFIG_SENSORS_APDS990X=m
 CONFIG_HMC6352=m
 CONFIG_DS1682=m
 CONFIG_VMWARE_BALLOON=m
-CONFIG_BMP085=y
+CONFIG_BMP085=m
 CONFIG_BMP085_I2C=m
 # CONFIG_PCH_PHUB is not set
 CONFIG_USB_SWITCH_FSA9480=m
@@ -5367,7 +5366,9 @@ CONFIG_SUNRPC_XPRT_RDMA=m
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SUNRPC_DEBUG=y
-# CONFIG_CEPH_FS is not set
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
 CONFIG_CIFS=m
 CONFIG_CIFS_STATS=y
 CONFIG_CIFS_STATS2=y