1.3.69, ppp 2.2.0e conflict

Keith Owens (kaos@audio.apana.org.au)
Wed, 28 Feb 1996 14:51:27 +1100 (EST)


An attempt to head off questions about "ppp does not work with 1.3.69" or
"patch_1.3.69 fails". Nothing to do with synchronous ppp.

patch-1.3.69 conflicts with ppp 2.2.0e, they both hit
include/linux/ppp_defs.h. If you have already done make kernel for ppp then
applying patch_1.3.69 will fail. It says "patch already applied, assume
-R?". You must reply "n" and when patch says "apply anyway?" reply "n"
again.

This will create ppp_defs.h.rej which can be ignored and should be deleted.
If you are using scripts/patch-kernel it will complain that you have reject
files, you will have to remove the .orig files yourself, see the last find
command in scripts/patch-kernel.