# patch -p1 --verbose < patch-2.6.32.504 Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/build/Makefile b/build/Makefile |index 0e5c8d4..5efb738 100644 |--- a/build/Makefile |+++ b/build/Makefile -------------------------- Patching file build/Makefile using Plan A... Hunk #1 succeeded at 35. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/build/Rules.in b/build/Rules.in |index 815b3da..dcfa492 100644 |--- a/build/Rules.in |+++ b/build/Rules.in -------------------------- Patching file build/Rules.in using Plan A... Hunk #1 succeeded at 65. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel |index 9ae93da..2f744b1 100644 |--- a/build/autoMakefile.am.toplevel |+++ b/build/autoMakefile.am.toplevel -------------------------- Patching file build/autoMakefile.am.toplevel using Plan A... Hunk #1 FAILED at 84. 1 out of 1 hunk FAILED -- saving rejects to file build/autoMakefile.am.toplevel.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4 |index 0833328..2adf6b7 100644 |--- a/build/autoconf/lustre-build-linux.m4 |+++ b/build/autoconf/lustre-build-linux.m4 -------------------------- Patching file build/autoconf/lustre-build-linux.m4 using Plan A... Hunk #1 succeeded at 238 (offset -1 lines). Hunk #2 FAILED at 391. 1 out of 2 hunks FAILED -- saving rejects to file build/autoconf/lustre-build-linux.m4.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 |index daed428..a990cab 100644 |--- a/lustre/autoconf/lustre-core.m4 |+++ b/lustre/autoconf/lustre-core.m4 -------------------------- Patching file lustre/autoconf/lustre-core.m4 using Plan A... Reversed (or previously applied) patch detected! Assume -R? [n] y Hunk #1 succeeded at 1810 with fuzz 2 (offset 166 lines). done ########################### Error with 1.8.9 git pull Type 'make' to build Lustre. + make -j 8 -s make[2]: Entering directory `/root/rpmbuild/BUILD/lustre-1.8.9' make[3]: Entering directory `/root/rpmbuild/BUILD/lustre-1.8.9' Making all in . make[4]: Entering directory `/root/rpmbuild/BUILD/lustre-1.8.9' make[5]: Entering directory `/root/rpmbuild/BUILD/lustre-1.8.9/lnet' make[5]: Leaving directory `/root/rpmbuild/BUILD/lustre-1.8.9/lnet' make[5]: Entering directory `/root/rpmbuild/BUILD/lustre-1.8.9/lustre' make[5]: Leaving directory `/root/rpmbuild/BUILD/lustre-1.8.9/lustre' make[5]: Entering directory `/usr/src/kernels/2.6.32-504.1.3.el6.x86_64' /root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/lloop.c: In function 'loop_set_fd': /root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/lloop.c:508: error: implicit declaration of function 'blk_queue_hardsect_size' make[8]: *** [/root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite/lloop.o] Error 1 make[7]: *** [/root/rpmbuild/BUILD/lustre-1.8.9/lustre/llite] Error 2 make[7]: *** Waiting for unfinished jobs.... make[6]: *** [/root/rpmbuild/BUILD/lustre-1.8.9/lustre] Error 2 make[5]: *** [_module_/root/rpmbuild/BUILD/lustre-1.8.9] Error 2 make[5]: Leaving directory `/usr/src/kernels/2.6.32-504.1.3.el6.x86_64' make[4]: *** [modules] Error 2 make[4]: Leaving directory `/root/rpmbuild/BUILD/lustre-1.8.9' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/root/rpmbuild/BUILD/lustre-1.8.9' make[2]: *** [all] Error 2 make[2]: Leaving directory `/root/rpmbuild/BUILD/lustre-1.8.9' error: Bad exit status from /var/tmp/rpm-tmp.CC0yg5 (%build) RPM build errors: Bad exit status from /var/tmp/rpm-tmp.CC0yg5 (%build) make[1]: *** [rpms-real] Error 1 make[1]: Leaving directory `/usr/src/patch_test/lustre-1.8.7' make: *** [rpms] Error 2