It kind of looks like someone at IBM made a mistake, and replaced the
linux-2.4.17-s390.tar.gz file with a new one that includes the lcs source
code (and probably a lot of other things it didn't before).  There may also
be collisions between that and the contents of linux-2.4.17-s390-2.tar.gz.

Mark Post

-----Original Message-----
From: Tyler Koyl [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, May 15, 2002 12:29 PM
To: [EMAIL PROTECTED]
Subject: 2.4.17 Patches -> Problems applying


Trying to build the proper kernel source tree for 2.4.17 available on the
IBM developer works site. Specifically the following:

linux-2.4.17.tar.gz (original kernel source)
+ linux-2.4.17-s390.diff (IBM)
+ linux-2.4.17-s390-1-lcs.diff (IBM)
+ linux-2.4.17-s390-2.diff (IBM)

The first one works great. but  linux-2.4.17-s390-1-lcs.diff does not go
very cleanly. This is what I got:

# patch -p0 < /home/tkoyl/2.4.17/linux-2.4.17-s390-1-lcs.diff
patching file linux-2.4.17/arch/s390/defconfig
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 162 (offset 37 lines).
patching file linux-2.4.17/arch/s390x/defconfig
Reversed (or previously applied) patch detected!  Assume -R? [n] y
Hunk #1 succeeded at 162 (offset 37 lines).
patching file linux-2.4.17/drivers/s390/Config.in
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file linux-2.4.17/drivers/s390/net/Makefile
Reversed (or previously applied) patch detected!  Assume -R? [n] y
The next patch would create the file linux-2.4.17/drivers/s390/net/lcs.c,
which already exists!  Assume -R? [n] y
patching file linux-2.4.17/drivers/s390/net/lcs.c
Hunk #1 FAILED at 1.
File linux-2.4.17/drivers/s390/net/lcs.c is not empty after patch, as
expected
1 out of 1 hunk FAILED -- saving rejects to file
linux-2.4.17/drivers/s390/net/lcs.c.rej

Not sure what is happening with the lcs.c file here. Within the patch it
looks like a complete rewrite of the file.

Has anyone run into this and have a possible solution?

Thanks,

Tyler Koyl
Software Support Specialist
Saskatchewan Wheat Pool
Regina, Saskatchewan, Canada

Reply via email to