summaryrefslogtreecommitdiff
path: root/drivers/staging/lustre
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2016-09-18 23:39:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-19 11:08:22 +0300
commit26e9c85b48b4e3a2301c049213de3b5456c6b0a4 (patch)
tree20b0599cacbbe1fd982d6784c25e4f93fb953b63 /drivers/staging/lustre
parentd566b9aec93e603f59430d32d7996b74a7b5f555 (diff)
downloadlinux-26e9c85b48b4e3a2301c049213de3b5456c6b0a4.tar.xz
staging: lustre: update version to 2.6.99
With all of the the missing patches from the lustre 2.7 version merged upstream its time to update the upstream clients version. Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
-rw-r--r--drivers/staging/lustre/lustre/include/lustre_ver.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_ver.h b/drivers/staging/lustre/lustre/include/lustre_ver.h
index 414075f82390..19c9135e2273 100644
--- a/drivers/staging/lustre/lustre/include/lustre_ver.h
+++ b/drivers/staging/lustre/lustre/include/lustre_ver.h
@@ -2,10 +2,10 @@
#define _LUSTRE_VER_H_
#define LUSTRE_MAJOR 2
-#define LUSTRE_MINOR 5
-#define LUSTRE_PATCH 60
+#define LUSTRE_MINOR 6
+#define LUSTRE_PATCH 99
#define LUSTRE_FIX 0
-#define LUSTRE_VERSION_STRING "2.5.99"
+#define LUSTRE_VERSION_STRING "2.6.99"
#define OBD_OCD_VERSION(major, minor, patch, fix) \
(((major) << 24) + ((minor) << 16) + ((patch) << 8) + (fix))