ibm9672:/usr/src/packages/SOURCES # head /tmp/UTSG-claw-2.4-patch diff -urN -X dontdiff linux/Documentation/s390/c7000.txt NEWlinux/Documentation/s390/c7000.txt --- linux/Documentation/s390/c7000.txt Wed Dec 31 16:00:00 1969 +++ NEWlinux/Documentation/s390/c7000.txt Wed Aug 22 13:50:17 2001 @@ -0,0 +1,92 @@ +Cisco 7000 (CLAW) support + +The c7000 module provides support for a channel attached Cisco 7xxx +family router on Linux/390. The parameters for the module are as follows: + + base0=0xYYYY This parameter defines the base unit address of the ibm9672:/usr/src/packages/SOURCES #
from the patch command I get the following: ibm9672:/usr/src/packages/SOURCES # patch -p1 < /tmp/UTSG-claw-2.4-patch The next patch would create the file Documentation/s390/c7000.txt, which already exists! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file Documentation/s390/c7000.txt.rej can't find file to patch at input line 100 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN -X dontdiff linux/arch/s390/defconfig NEWlinux/arch/s390/defconfig |--- linux/arch/s390/defconfig Wed Aug 22 15:03:27 2001 |+++ NEWlinux/arch/s390/defconfig Wed Aug 22 13:52:12 2001 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 111 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN -X dontdiff linux/drivers/s390/Config.in NEWlinux/drivers/s390/Config.in |--- linux/drivers/s390/Config.in Wed Aug 22 15:03:27 2001 |+++ NEWlinux/drivers/s390/Config.in Wed Aug 22 13:53:57 2001 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 125 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN -X dontdiff linux/drivers/s390/net/Makefile NEWlinux/drivers/s390/net/Makefile |--- linux/drivers/s390/net/Makefile Wed Aug 22 15:03:28 2001 |+++ NEWlinux/drivers/s390/net/Makefile Wed Aug 22 13:54:46 2001 -------------------------- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored The next patch would create the file drivers/s390/net/c7000.c, which already exists! Assume -R? [n] Apply anyway? [n] Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file drivers/s390/net/c7000.c.rej ibm9672:/usr/src/packages/SOURCES #
