From 04a7ad465a9878afcc8a05289e2f308e1e642aec Mon Sep 17 00:00:00 2001
From: alex <alex>
Date: Sat, 6 Aug 2005 12:15:15 +0000
Subject: [PATCH] - minor cleanups in that patch, quilt pop was claiming about
 old version

---
 .../patches/highmem-split-2.6.10-fc3.patch    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch b/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
index f0498b02ab..5fccda7ff0 100644
--- a/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
+++ b/lustre/kernel_patches/patches/highmem-split-2.6.10-fc3.patch
@@ -1,6 +1,6 @@
-diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig
---- ./arch/i386/Kconfig	2004-08-25 21:38:29.435578760 -0600
-+++ ../linux-2.6.8.1-mem/./arch/i386/Kconfig	2004-08-25 20:50:36.000000000 -0600
+diff -Naur linux-2.6.10/arch/i386/Kconfig linux-2.6.10/arch/i386/Kconfig
+--- linux-2.6.10/arch/i386/Kconfig	2004-08-25 21:38:29.435578760 -0600
++++ linux-2.6.10/arch/i386/Kconfig	2004-08-25 20:50:36.000000000 -0600
 @@ -721,6 +721,27 @@
  	depends on HIGHMEM64G
  	default y
@@ -29,9 +29,9 @@ diff -Naur ./arch/i386/Kconfig ../linux-2.6.8.1-mem/./arch/i386/Kconfig
  # Common NUMA Features
  config NUMA
  	bool "Numa Memory Allocation and Scheduler Support"
-diff -Naur ./include/asm-generic/page_offset.h ../linux-2.6.8.1-mem/./include/asm-generic/page_offset.h
---- ./include/asm-generic/page_offset.h	1969-12-31 17:00:00.000000000 -0700
-+++ ../linux-2.6.8.1-mem/./include/asm-generic/page_offset.h	2004-08-25 20:51:03.000000000 -0600
+diff -Naur linux-2.6.10/include/asm-generic/page_offset.h linux-2.6.10/include/asm-generic/page_offset.h
+--- linux-2.6.10/include/asm-generic/page_offset.h	1969-12-31 17:00:00.000000000 -0700
++++ linux-2.6.10/include/asm-generic/page_offset.h	2004-08-25 20:51:03.000000000 -0600
 @@ -0,0 +1,24 @@
 +
 +#include <linux/config.h>
@@ -57,9 +57,9 @@ diff -Naur ./include/asm-generic/page_offset.h ../linux-2.6.8.1-mem/./include/as
 +#endif
 +
 +#endif
-diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/asm-generic/vmlinux.lds.h
---- ./include/asm-generic/vmlinux.lds.h	2004-08-14 04:54:48.000000000 -0600
-+++ ../linux-2.6.8.1-mem/./include/asm-generic/vmlinux.lds.h	2004-08-25 20:49:32.000000000 -0600
+diff -Naur linux-2.6.10/include/asm-generic/vmlinux.lds.h linux-2.6.10/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.10/include/asm-generic/vmlinux.lds.h	2004-08-14 04:54:48.000000000 -0600
++++ linux-2.6.10/include/asm-generic/vmlinux.lds.h	2004-08-25 20:49:32.000000000 -0600
 @@ -1,3 +1,6 @@
 +
 +#include <asm-generic/page_offset.h>
@@ -67,9 +67,9 @@ diff -Naur ./include/asm-generic/vmlinux.lds.h ../linux-2.6.8.1-mem/./include/as
  #ifndef LOAD_OFFSET
  #define LOAD_OFFSET 0
  #endif
-diff -Naur ./include/asm-i386/page.h ../linux-2.6.8.1-mem/./include/asm-i386/page.h
---- ./include/asm-i386/page.h	2004-08-14 04:54:50.000000000 -0600
-+++ ../linux-2.6.8.1-mem/./include/asm-i386/page.h	2004-08-25 20:49:32.000000000 -0600
+diff -Naur linux-2.6.10/include/asm-i386/page.h linux-2.6.10/include/asm-i386/page.h
+--- linux-2.6.10/include/asm-i386/page.h	2004-08-14 04:54:50.000000000 -0600
++++ linux-2.6.10/include/asm-i386/page.h	2004-08-25 20:49:32.000000000 -0600
 @@ -119,9 +119,11 @@
  #endif /* __ASSEMBLY__ */
  
-- 
GitLab