diff options
| author | James Simmons <jsimmons@infradead.org> | 2016-08-19 18:07:31 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-21 14:09:27 (GMT) |
| commit | 182ae52ddbe6acf99d876ebef9723240b1a662fb (patch) | |
| tree | 5ecc2cd1ae6cd7814a043cdef2ed3b7dd3dd48b5 /drivers/staging/lustre | |
| parent | 70a251f68dea16eab3c502261f3a2e957751e2ab (diff) | |
| download | linux-182ae52ddbe6acf99d876ebef9723240b1a662fb.tar.xz | |
staging: lustre: update version to 2.5.99
With all but one of the the missing patches from the
lustre 2.6 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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre_ver.h b/drivers/staging/lustre/lustre/include/lustre_ver.h index 2bb59b2..414075f 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 4 +#define LUSTRE_MINOR 5 #define LUSTRE_PATCH 60 #define LUSTRE_FIX 0 -#define LUSTRE_VERSION_STRING "2.4.60" +#define LUSTRE_VERSION_STRING "2.5.99" #define OBD_OCD_VERSION(major, minor, patch, fix) \ (((major) << 24) + ((minor) << 16) + ((patch) << 8) + (fix)) |