The following commit has been merged in the master branch:
commit a0ec60ea212e750f413764738bf6a3fe56ee33e1
Author: Patrick Winnertz <win...@debian.org>
Date: Fri Oct 9 12:19:12 2009 +0200
Fixed some compiling issues on 2.6.26 about double symbols
Signed-off-by: Patrick Winnertz <win...@debian.org>
diff --git a/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
b/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
index 42c68c1..c8e1ae7 100644
--- a/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
+++ b/lustre/kernel_patches/patches/export-2.6.26-vanilla.patch
@@ -10,19 +10,6 @@ Index: linux-source-2.6.26/fs/jbd2/journal.c
/*
* Force and wait upon a commit if the calling process is not within
-Index: linux-source-2.6.26/kernel/sys.c
-===================================================================
---- linux-source-2.6.26.orig/kernel/sys.c 2009-10-09 13:49:43.000000000
+0200
-+++ linux-source-2.6.26/kernel/sys.c 2009-10-09 13:49:50.000000000 +0200
-@@ -1346,6 +1346,8 @@
-
- EXPORT_SYMBOL(uts_sem);
-
-+EXPORT_SYMBOL(uts_sem);
-+
- SYSCALL_DEFINE1(newuname, struct new_utsname __user *, name)
- {
- int errno = 0;
Index: linux-source-2.6.26/security/security.c
===================================================================
--- linux-source-2.6.26.orig/security/security.c 2009-10-09
13:49:43.000000000 +0200
diff --git a/lustre/kernel_patches/series/2.6.26-vanilla.patch
b/lustre/kernel_patches/series/2.6.26-vanilla.series
similarity index 100%
rename from lustre/kernel_patches/series/2.6.26-vanilla.patch
rename to lustre/kernel_patches/series/2.6.26-vanilla.series
--
Lustre Debian Packaging
_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit
