2004-09-10 01:42:23

by Johann Koenig

[permalink] [raw]
Subject: patches failing - is 2.6.9-rc1 patch against 2.6.8? (not 2.6.8.1)

I get the following when trying to get the 2.6.9-rc1 kernel:

jkoenig@note:/usr/src$ grep -i fail patch.rc1.info -A5 -B5
patching file Documentation/pci.txt
patching file Documentation/usb/sn9c102.txt
patching file Documentation/watchdog/pcwd-watchdog.txt
patching file MAINTAINERS
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 13 hunks FAILED -- saving rejects to file Makefile.rej
patching file arch/alpha/Kconfig
patching file arch/alpha/Kconfig.debug
patching file arch/alpha/Makefile
patching file arch/alpha/boot/Makefile
patching file arch/alpha/kernel/Makefile
--
patching file fs/nfs/delegation.c
patching file fs/nfs/delegation.h
patching file fs/nfs/dir.c
patching file fs/nfs/direct.c
patching file fs/nfs/file.c
Hunk #2 FAILED at 74.
Hunk #3 FAILED at 91.
2 out of 11 hunks FAILED -- saving rejects to file fs/nfs/file.c.rej
patching file fs/nfs/inode.c
patching file fs/nfs/mount_clnt.c
patching file fs/nfs/nfs2xdr.c
patching file fs/nfs/nfs3proc.c
patching file fs/nfs/nfs3xdr.c
jkoenig@note:/usr/src$

and this for 2.6.9-rc1-mm4:

jkoenig@note:/usr/src$ grep -i fail patch.mm4.info -A5 -B5
patching file lib/zlib_inflate/inftrees.c
patching file lib/zlib_inflate/inftrees.h
patching file lib/zlib_inflate/Makefile
patching file MAINTAINERS
patching file Makefile
Hunk #1 FAILED at 1.
1 out of 16 hunks FAILED -- saving rejects to file Makefile.rej
patching file mm/bootmem.c
patching file mm/filemap.c
patching file mm/hugetlb.c
patching file mm/Makefile
patching file mm/memory.c
jkoenig@note:/usr/src$

Full files available at
http://mental-graffiti.com/kernel/patch/

--
-johann koenig
Now Playing: 54orty - S.S. : Trying To Break Even: The Northwest
Compilation Today is Boomtime, the 33rd day of Bureaucracy in the YOLD
3170 My public pgp key: http://mental-graffiti.com/pgp/


2004-09-10 01:57:41

by Tomasz Torcz

[permalink] [raw]
Subject: Re: patches failing - is 2.6.9-rc1 patch against 2.6.8? (not 2.6.8.1)

On Thu, Sep 09, 2004 at 09:42:08PM -0400, Johann Koenig wrote:
> I get the following when trying to get the 2.6.9-rc1 kernel:
>
> jkoenig@note:/usr/src$ grep -i fail patch.rc1.info -A5 -B5
> patching file Makefile
> Hunk #1 FAILED at 1.
> 1 out of 13 hunks FAILED -- saving rejects to file Makefile.rej
> patching file fs/nfs/file.c
> Hunk #2 FAILED at 74.
> Hunk #3 FAILED at 91.
> 2 out of 11 hunks FAILED -- saving rejects to file fs/nfs/file.c.rej

You are probably patching 2.6.8.1. That's wrong way. 2.6.9-rc1.patch is
made against 2.6.8.

--
Tomasz Torcz To co nierealne - tutaj jest normalne.
[email protected] Ziomale na ?ycie maj? tu patenty specjalne.

2004-09-10 02:08:42

by Johann Koenig

[permalink] [raw]
Subject: Re: patches failing - is 2.6.9-rc1 patch against 2.6.8? (not 2.6.8.1)

On Friday September 10 at 03:57am
Tomasz Torcz <[email protected]> wrote:

> You are probably patching 2.6.8.1. That's wrong way. 2.6.9-rc1.patch
> is made against 2.6.8.

Thank you
--
-johann koenig
Now Playing: Ace Troubleshooter - Tonight : Safety First
Today is Boomtime, the 33rd day of Bureaucracy in the YOLD 3170
My public pgp key: http://mental-graffiti.com/pgp/