Split 2.5 and 2.6 development branches apart

New tag 2.5.50 for what will eventually become 2.6.0

Change-Id: I6ba45bb595f43fb0dfc842b1ff21c7dc73513e14

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index d045017..479e1d0 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,4 +1,24 @@
 TBD Intel Corporation
+       * version 2.6.0
+       * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
+       * Server support for kernels:
+        2.6.32-358.18.1.el6  (RHEL6)
+       * Client support for unpatched kernels:
+        2.6.32-358.18.1.el6  (RHEL6)
+         2.6.27.19-5         (SLES11)
+        2.6.18-348.3.1.el5  (RHEL5)
+         2.6.16.60-0.69.1    (SLES10)
+         3.6.10-2.fc17       (FC17)
+       * Recommended e2fsprogs version: 1.42.7.wc1
+       * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
+         since the NFSv4 export of Lustre filesystem with 4K stack may cause a
+         stack overflow. For more information, please refer to bugzilla 17630.
+       * NFSv4 reexport to 32-bit NFS client nodes requires Lustre client on
+         the re-exporting nodes to be mounted with "32bitapi" mount option
+
+--------------------------------------------------------------------------------
+
+10-31-2013 Intel Corporation
        * version 2.5.0
        * See http://wiki.whamcloud.com/display/PUB/Lustre+Support+Matrix
        * Server support for kernels:

diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 49f6de2..8dda0ad 100644 (file)
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[2])
-m4_define([LUSTRE_MINOR],[4])
-m4_define([LUSTRE_PATCH],[93])
+m4_define([LUSTRE_MINOR],[5])
+m4_define([LUSTRE_PATCH],[50])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 6347213..024c1df 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -819,7 +819,7 @@ static int ll_options(char *options, int *flags)
                         *flags &= ~tmp;
                         goto next;
                 }
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 50, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 5, 51, 0)
                 tmp = ll_set_opt("acl", s1, LL_SBI_ACL);
                 if (tmp) {
                         /* Ignore deprecated mount option.  The client will