On Sun, Nov 11, 2001 at 11:22:37AM -0500, Tom wrote:> If I patch the 2.4.14 kernel with the grsecurity patch first I get
> errors while patching the ext3 patch.
>
> the link for the grsecuritypatch
> is http://www.grsecurity.net/download.htm
>
> (which ever patch I do first works fine..the onther patch fails)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^>
> this is the error I get fro patching the ext3 patch second
>
> (I get an error inthe same place if I patch the grsecurity patch second)
>
> Hunk #1 FAILED at 399.
> Hunk #2 succeeded at 519 (offset 30 lines).
> 1 out of 2 hunks FAILED -- saving rejects to file
> include/linux/sched.h.rej
>
> this is the output from that file
>
This is definately not an ext3 problem...
> ***************
> *** 399,404 ****
> u32 self_exec_id;
> /* Protection of (de-)allocation: mm, files, fs, tty */
> spinlock_t alloc_lock;
> };
>
> /*
> --- 399,407 ----
> u32 self_exec_id;
> /* Protection of (de-)allocation: mm, files, fs, tty */
> spinlock_t alloc_lock;
> +
> + /* journalling filesystem info */
> + void *journal_info;
> };
>
> /*
>
So?
Find the line that has "spinlock_t alloc_lock;" in it and add the
lines that
start with "+" below it. In this case, it's just a bunch of
definitions and
you're not messing with any ordering issues or structs...
You know how to read a patch right?
Whenever I merge new patches, I use "cat file | patch -sp1 -F3
--dry-run" to
see if there are any rejects. The -F3 might help you apply some patches,
sometimes it doesn't. It depends on how big the chunks in the patch are...
(BTW, the default is -F2).
Mike