From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [PATCH 4/14 linux-2.6.7-rc1] prism54: add support for avs header in Date: Thu, 27 May 2004 14:21:39 -0400 Sender: prism54-devel-admin@prism54.org Message-ID: <40B631B3.4000902@pobox.com> References: <20040524083146.GE3330@ruslug.rutgers.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Cc: Andrew Morton , linux-kernel@vger.kernel.org, netdev@oss.sgi.com, prism54-devel@prism54.org Return-path: To: "Luis R. Rodriguez" In-Reply-To: <20040524083146.GE3330@ruslug.rutgers.edu> Errors-To: prism54-devel-admin@prism54.org List-Help: List-Post: List-Subscribe: , List-Unsubscribe: , List-Archive: List-Id: netdev.vger.kernel.org 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. Jeff