On Thu, May 27, 2004 at 02:21:39PM -0400, Jeff Garzik wrote:
> Luis R. Rodriguez wrote:
> >diff -u -r1.31 -r1.33
> >--- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_eth.c 18 Mar
> >2004
> >15:27:44 -0000 1.31
> >+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_eth.c 19 Mar
> >2004
> >23:03:58 -0000 1.33
> >@@ -1,4 +1,4 @@
> >-/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.31 2004/03/18
> >15:27:44 ajfa Exp $
> >+/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.33 2004/03/19
> >23:03:58 ajfa Exp $
>
>
> Please remove CVS substitions from your code, they cause endless patch
> rejects if I choose to apply (for example) 10 out of 14 patches.
Will do. So if you get
--- ksrc/islpci_eth.c
+++ ksrc-new/islpci_eth.c
patches, that'll be OK? I substituted ksrc to
linux-2.6.7-rc1/drivers/net/wireless/prism54 thinking that'll ease your
job. Sorry for any inconvenience.
Luis
--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
pgpUUn3m7UWC4.pgp
Description: PGP signature
|