X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fautoconf%2Flustre-core.m4;h=4c8bef4789f99b4b3ee445493aa470d37d5dc04b;hp=436737b71ae1731ead01951a19ebd4db1eaf0e86;hb=7cdc4b709a2147fa98a9bb56ff06a1dfcaa434a5;hpb=b447395e09b56393a20801a2bc7c545fe001ca7c

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 436737b..4c8bef4 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -2004,6 +2004,9 @@ vm_fault_t, [
 # When inode times are timespec64 stop using the deprecated
 # time interfaces.
 #
+# kernel v5.5-rc1-6-gba70609d5ec6 ba70609d5ec664a8f36ba1c857fcd97a478adf79
+# fs: Delete timespec64_trunc()
+#
 AC_DEFUN([LC_INODE_TIMESPEC64], [
 tmp_flags="$EXTRA_KCFLAGS"
 EXTRA_KCFLAGS="-Werror"
@@ -2012,9 +2015,9 @@ inode_timespec64, [
 	#include <linux/fs.h>
 ],[
 	struct inode *inode = NULL;
-	struct timespec64 ts = {};
+	struct timespec64 ts = {0, 1};
 
-	inode->i_atime = timespec64_trunc(ts, 1);
+	inode->i_atime = ts;
 	(void)inode;
 ],[
 	AC_DEFINE(HAVE_INODE_TIMESPEC64, 1,
@@ -2733,7 +2736,7 @@ AC_ARG_WITH([bash-completion-dir],
 AS_IF([test "x$with_bash_completion_dir" = "xyes"], [
 	BASH_COMPLETION_DIR="`pkg-config --variable=completionsdir bash-completion`"
 	AS_IF([test "x$BASH_COMPLETION_DIR" = "x"], [
-		[BASH_COMPLETION_DIR="$datadir/bash-completion/completions"]
+		[BASH_COMPLETION_DIR="/usr/share/bash-completion/completions"]
 	])
 ], [
 	BASH_COMPLETION_DIR="$with_bash_completion_dir"
@@ -2793,6 +2796,7 @@ lustre/kernel_patches/targets/3.10-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.5.target
 lustre/kernel_patches/targets/4.14-rhel7.6.target
 lustre/kernel_patches/targets/4.12-sles12sp4.target
+lustre/kernel_patches/targets/4.12-sles12sp5.target
 lustre/kernel_patches/targets/4.12-sles15sp1.target
 lustre/kernel_patches/targets/3.x-fc18.target
 lustre/ldlm/Makefile