From: mcgrof@ruslug.rutgers.edu (Luis R. Rodriguez)
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Andrew Morton <akpm@osdl.org>,
linux-kernel@vger.kernel.org, netdev@oss.sgi.com,
prism54-devel@prism54.org
Subject: Re: Re: [PATCH 4/14 linux-2.6.7-rc1] prism54: add support for avs header in
Date: Thu, 27 May 2004 15:16:49 -0400 [thread overview]
Message-ID: <20040527191649.GT3330@ruslug.rutgers.edu> (raw)
In-Reply-To: <40B631B3.4000902@pobox.com>
[-- Attachment #1: Type: text/plain, Size: 1025 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2004-05-27 19:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-05-24 8:31 [PATCH 4/14 linux-2.6.7-rc1] prism54: add support for avs header in Luis R. Rodriguez
2004-05-27 18:21 ` Jeff Garzik
2004-05-27 19:16 ` Luis R. Rodriguez [this message]
2004-05-27 19:31 ` Jeff Garzik
2004-05-27 19:31 ` CVS tags (was Re: [Prism54-devel] " Valdis.Kletnieks
2004-05-27 19:56 ` CVS tags (was " Jeff Garzik
2004-05-27 20:01 ` CVS tags (was Re: [Prism54-devel] " Andreas Dilger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040527191649.GT3330@ruslug.rutgers.edu \
--to=mcgrof@ruslug.rutgers.edu \
--cc=akpm@osdl.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@oss.sgi.com \
--cc=prism54-devel@prism54.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).