Re: [Sheflug] 2.4.15 ext2 breakage - patch

[Barrie Bremner <xxxxx [at] xxxxxxxxxxxxxxxxx>]

>>>>> "Chris" == Chris J <cej [at] nccnet.co.uk> writes:

    >> Am I doing something wrong here?
    >> 
    >> I attempted to apply Al Viro's patch, by copying it to a file
    >> (/usr/local/src/patch-2.4.15.1), then:
    >> 
    >> cd /usr/local/src/linux-2.4.15/ patch -p1 < ../patch-2.4.15.1
    >> 
    >> It failled.
    >> 
    >> Tips please?

    Chris> Worked okay here patching with the same command ... did you
    Chris> copy the entire patch into the file ... 87 lines by my
    Chris> reckoning (2555 bytes). The first line of the patch starts
    Chris> with:

    Chris> 	diff -urN S15/fs/inode.c S15-fix/fs/inode.c

    Chris> and the last line reads (below the #ifdef's) ... yes it is
    Chris> part of the patch, rather than a duff line:

    Chris> 	/*

Note: I'm patching 2.4.15-final/greased-turkey not 2.4.15-pre9 - I'm
assuming this patch works for both?

Yep, that's exactly what I took to be the first and last lines of the
patch.

[root@flux linux-2.4.15]# patch -p1 < ../patch-2.4.15.1
patching file fs/inode.c
Hunk #1 FAILED at 1065.
1 out of 1 hunk FAILED -- saving rejects to file fs/inode.c.rej
patching file fs/super.c
Hunk #1 FAILED at 462.
Hunk #2 FAILED at 615.
Hunk #3 FAILED at 697.
Hunk #4 FAILED at 742.
4 out of 4 hunks FAILED -- saving rejects to file fs/super.c.rej
patching file include/linux/fs.h
Hunk #1 FAILED at 110.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/fs.h.rej

Might just wait a bit longer then....

Baz.

-- 
Barrie J. Bremner		OpenPGP public key ID: F78CEE08
baz [at] barriebremner.com	http://barriebremner.com/


___________________________________________________________________

Sheffield Linux User's Group - http://www.sheflug.co.uk . 
To unsubscribe from this list send mail to 
shef-lug-request@list.sheflug.org.uk with the word
"unsubscribe" in the body of the message. 

  GNU the choice of a complete generation.