From: phil <phil>
Date: Fri, 22 Aug 2003 22:51:10 +0000 (+0000)
Subject: merge HEAD into b_devel, including socknal autoconnect and new v24 kernel
X-Git-Tag: v1_7_100~1^368~57
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=23808eb91ad7ff2587c1da6682d2e20e554be8de;p=fs%2Flustre-release.git

merge HEAD into b_devel, including socknal autoconnect and new v24 kernel
---

diff --git a/lustre/kernel_patches/patches/lustre_version.patch b/lustre/kernel_patches/patches/lustre_version.patch
index 526b4e3..c4effbc 100644
--- a/lustre/kernel_patches/patches/lustre_version.patch
+++ b/lustre/kernel_patches/patches/lustre_version.patch
@@ -7,6 +7,6 @@
 --- /dev/null	Fri Aug 30 17:31:37 2002
 +++ linux-2.4.18-18.8.0-l12-braam/include/linux/lustre_version.h	Thu Feb 13 07:58:33 2003
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 22
++#define LUSTRE_KERNEL_VERSION 24
 
 _