2002-02-11 11:28:28

by Roy Sigurd Karlsbakk

Subject: paching 2.5.4 to -pre6???

hi all

Is there something wrong with the -pre6 patch?

I'm trying to patch up the 2.5.4...

# tar xzf ../packed/k/linux-2.5.4.tar.gz
# cd linux-2.4.5
# zcat ../../packed/k/patch-2.5.4-pre6.gz | patch -p1
patching file CREDITS
Reversed (or previously applied) patch detected! Assume -R? [n]

and so on... patch -p1 -R gives me some hunks, but generally works ...

What's wrong????

thanks

roy

--
Roy Sigurd Karlsbakk, MCSE, MCNE, CLS, LCA

Computers are like air conditioners.
They stop working when you open Windows.

2002-02-12 01:12:22

by Michael Cohen

Subject: Re: paching 2.5.4 to -pre6???

On Mon, 2002-02-11 at 06:28, Roy Sigurd Karlsbakk wrote:
> hi all
>
> Is there something wrong with the -pre6 patch?
>
> I'm trying to patch up the 2.5.4...
>
> # tar xzf ../packed/k/linux-2.5.4.tar.gz
> # cd linux-2.4.5
> # zcat ../../packed/k/patch-2.5.4-pre6.gz | patch -p1
pre6 is already included in 2.5.4.
The next patch that applies to 2.5.4 will be 2.5.5-pre1.

> patching file CREDITS
> Reversed (or previously applied) patch detected! Assume -R? [n]
> and so on... patch -p1 -R gives me some hunks, but generally works ...
Yes, because you're backing out 2.5.4-pre6's changes. not a good idea.
Just leave the 2.5.4 tarball alone for now.