When a new patch comes out the old patch can be reversed via a patch -R,
and then the new patch applied. The patches are cumulative, not
incremental although someone is maintaining diff's between patches.
Alan has been mentioning this in his -ac announcements.
| "Consequences, Schmonsequences, as long as I'm
Jeff Hittman | rich." -- "Ali Baba Bunny" [1957, Chuck Jones]
jhittman@slip.net |
|
On Tue, 13 Jun 2000, [iso-8859-1] Christoph Brüninghaus wrote:
> Hello,
> i am trying to patch 2.4.0test1 with the patches supplied by Alan.
> For this i have modified the patch-kernel-script in /usr/src/linux/scripts
> in order to work with the patches (the original script only works with patches
> named patch-x.x.xx.gz, not with patch-x.x.xxtest1-acx.gz)
>
> The first patch is applied correctly, but the second patch causes the
> following errors:
>
> "erlenhagen:/usr/src # linux/scripts/patch-kernel
> Current kernel version is 2.4.0
> 2.4.0test1-ac1
> Applying patch-2.4.0test1-ac1 (gzip)... done.
> 2.4.0test1-ac2
> Applying patch-2.4.0test1-ac2 (gzip)... Reversed (or previously applied) patch detected! Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to file CREDITS.rej
> Reversed (or previously applied) patch detected! Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to file Documentation/Configure.help.rej
> Reversed (or previously applied) patch detected! Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file Documentation/filesystems/bfs.txt.rej
> Reversed (or previously applied) patch detected! Skipping patch.
> 5 out of 5 hunks ignored -- saving rejects to file Documentation/networking/sk98lin.txt.rej
> Reversed (or previously applied) patch detected! Skipping patch.
> 3 out of 3 hunks ignored -- saving rejects to file MAINTAINERS.rej
> 1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
> Reversed (or previously applied) patch detected! Skipping patch.
> 2 out of 2 hunks ignored -- saving rejects to file arch/i386/kernel/acpi.c.rej
> 1 out of 18 hunks FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej
>
> [....so on for all hunks....]
>
> 1 out of 1 hunk ignored -- saving rejects to file net/unix/af_unix.c.rej
> failed. Clean up yourself."
>
> I understand the messages, but how can this happen?
> I am patching the original, untouched sources downloaded from www.kernel.org.
>
> What could be the problem?
>
> Chris
> --
> Bunte Liga Köln:
> Dr. Reiner Klimke auf Ahlerich- Schönheit und Ausdauer 2:1
> Dr. Reiner Klimke auf Ahlerich - Bertis Rache 4:1
> Squadra Jura- Dr. Reiner Klimke auf Ahlerich 0:4
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.rutgers.edu
> Please read the FAQ at http://www.tux.org/lkml/
>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Jun 15 2000 - 21:00:29 EST