From b61a5e358cb197227e20c3f60d5c5bb289d5e20e Mon Sep 17 00:00:00 2001 From: adilger Date: Mon, 7 Apr 2003 19:55:55 +0000 Subject: [PATCH] Remove CVS tags from patch, so we don't get patch conflicts. --- lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch index cccc52a..461fc3f 100644 --- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch +++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch @@ -48,7 +48,7 @@ include/asm-ppc64/unistd.h | 2 include/asm-s390/unistd.h | 15 include/asm-s390x/unistd.h | 15 - include/asm-sparc/unistd.h | 26 + include/asm-sparc/unistd.h | 22 include/asm-sparc64/unistd.h | 24 include/linux/cache_def.h | 15 include/linux/errno.h | 4 @@ -4784,12 +4784,6 @@ --- linux-2.4.20/include/asm-sparc/unistd.h~linux-2.4.20-xattr-0.8.54 Sat Apr 5 03:57:18 2003 +++ linux-2.4.20-braam/include/asm-sparc/unistd.h Sat Apr 5 03:57:18 2003 -@@ -1,4 +1,4 @@ --/* $Id: linux-2.4.20-xattr-0.8.54.patch,v 1.1.2.1 2003/04/05 11:14:59 braam Exp $ */ -+/* $Id: linux-2.4.20-xattr-0.8.54.patch,v 1.1.2.1 2003/04/05 11:14:59 braam Exp $ */ - #ifndef _SPARC_UNISTD_H - #define _SPARC_UNISTD_H - @@ -184,24 +184,24 @@ /* #define __NR_exportfs 166 SunOS Specific */ #define __NR_mount 167 /* Common */ -- 1.8.3.1