On Wed, 3 Nov 2010 18:40:13 +0100, Philipp Thomas <pth@suse.de> wrote:
* doiggl@velocitynet.com.au (doiggl@velocitynet.com.au) [20101103 15:05]:
# patch -p1 < reiser4-for-2.6.35.patch [...] patching file include/linux/mm.h Hunk #1 succeeded at 861 with fuzz 1 (offset 4 lines).
The above is the clue. Use 'patch -p1 --fuzz=0 -i reiser4-for-2.6.35.patch' like it's done for openSUSE and you'll get the same result.
How can it be fixed ? Regenerate the patch so that it applies without fuzz.
Philipp
Hello I used "patch -p1 --fuzz=0 -i ../patches.rpmify/reiser4-for-2.6.35.patch" it went a little further and got the following patching file Documentation/Changes patching file Documentation/filesystems/reiser4.txt . . patching file fs/reiser4/znode.c patching file fs/reiser4/znode.h 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 FAILED at 857. 1 out of 1 hunk FAILED -- saving rejects to file include/linux/mm.h.rej 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). ++ echo '*** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed ***' *** patch ../patches.rpmify/reiser4-for-2.6.35.patch failed *** - Is it possible to list out the mm.h.rej content if so how can that be done ?. and
Regenerate the patch so that it applies without fuzz
- How can the patch be regenerated ? What else can be done to apply the patch. Thanks Glenn -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kernel+help@opensuse.org