From: Michael Cohen <me@ohdarn.net>
To: linux-kernel@vger.kernel.org
Cc: Roy Sigurd Karlsbakk <roy@karlsbakk.net>
Subject: Re: paching 2.5.4 to -pre6???
Date: 11 Feb 2002 20:12:01 -0500 [thread overview]
Message-ID: <1013476321.26192.2.camel@ohdarn.net> (raw)
In-Reply-To: <Pine.LNX.4.30.0202111222240.27823-100000@mustard.heime.net>
In-Reply-To: <Pine.LNX.4.30.0202111222240.27823-100000@mustard.heime.net>
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.
prev parent reply other threads:[~2002-02-12 1:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-02-11 11:28 paching 2.5.4 to -pre6??? Roy Sigurd Karlsbakk
2002-02-12 1:12 ` Michael Cohen [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1013476321.26192.2.camel@ohdarn.net \
--to=me@ohdarn.net \
--cc=linux-kernel@vger.kernel.org \
--cc=roy@karlsbakk.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox