[Pkg-lustre-svn-commit] updated: [25dc661] Removed fix-2.6.15-versioncheck.patch

[Marco Nelles]

The following commit has been merged in the master branch:
commit 25dc661f04014e54dddc6f7fda97bc0617bd98b1
Author: Marco Nelles <marco.nelles at credativ.de>
Date:   Tue Jun 5 09:54:03 2012 +0200

    Removed fix-2.6.15-versioncheck.patch

diff --git a/debian/patches/fix-2.6.15-versioncheck.patch b/debian/patches/fix-2.6.15-versioncheck.patch
deleted file mode 100644
index 19066cf..0000000
--- a/debian/patches/fix-2.6.15-versioncheck.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-## fix-2.6.15-versioncheck.dpatch by Niklas Edmundsson <Niklas.Edmundsson at hpc2n.umu.se>
-## DP: Fix version-check for 2.6.15 ubuntu/vanilla kernel.
-## DP: Upstream check assumes RedHat patched kernel.
-
-diff lustre-1.6.2/lustre/include/linux/lustre_compat25.h lustre-1.6.2/lustre/include/linux/lustre_compat25.h
-Index: lustre/lustre/include/linux/lustre_compat25.h
-===================================================================
---- lustre.orig/lustre/include/linux/lustre_compat25.h	2010-12-07 16:54:32.597545003 +0100
-+++ lustre/lustre/include/linux/lustre_compat25.h	2010-12-07 17:00:32.345545003 +0100
-@@ -106,7 +106,7 @@
- #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
- #endif /* HAVE_INODE_I_MUTEX */
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
- #define d_child d_u.d_child
- #define d_rcu d_u.d_rcu
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 17761d7..8cbbb39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ bash-completion.patch
 lustre-manpage.patch
 tex2pdf.patch
 lustre-config.patch
-#fix-2.6.15-versioncheck.patch
 #bug13852-quota_includes.patch
 #enable-quota.patch
 #fix-symlink-attack.patch

-- 
Lustre Debian Packaging