On Thu, 4 Nov 2010 14:18:19 +0100, Philipp Thomas <pth@suse.de> wrote:
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101104 10:51]:
1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej
So as expected you get the same failure.
- Is it possible to list out the mm.h.rej content if so how can that be done ?.
No, you'd have to build locally.
- How can the patch be regenerated ?
Use quilt :) Create a ~/.quiltrc with the following contents
-------------------->8 cut 8<-------------------------- #Options passed to GNU diff when generating patches QUILT_DIFF_OPTS="--show-c-function"
# Options passed to GNU patch when applying patches QUILT_PATCH_OPTS="--reject-format=unified --backup --fuzz=0"
# Options to pass to commands (QUILT_${COMMAND}_ARGS) QUILT_PUSH_ARGS="--color=auto" QUILT_SETUP_ARGS="--fuzz=0" QUILT_DIFF_ARGS="--color=auto" QUILT_REFRESH_ARGS="--backup -p0" -------------------->8 cut 8<--------------------------
Which will make quilt call patch with --fuzz=0. Apply the patch with quilt, adapt it to apply cleanly and then regenerate with quilt.
Philipp
Thanks for the help. Cheers Glenn. This fixed it [from the log] + cd linux-2.6.35.8 + /usr/src/packages/SOURCES/apply-patches --vanilla /usr/src/packages/SOURCES/series.conf .. + patch -p1 --fuzz=1 -i ../patches.rpmify/reiser4-for-2.6.35.patch patching file Documentation/Changes patching file Documentation/filesystems/reiser4.txt patching file fs/fs-writeback.c . . patching file include/linux/fs.h Hunk #1 succeeded at 516 (offset 2 lines). Hunk #2 succeeded at 1575 (offset 2 lines). Hunk #3 succeeded at 2096 (offset 2 lines). patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines). patching file include/linux/writeback.h patching file mm/filemap.c patching file mm/page-writeback.c Hunk #1 succeeded at 1136 (offset -6 lines). -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org