Re: [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* Re: [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags
       [not found] <200405310211.46049.margitsw@t-online.de>
@ 2004-06-02 19:56 ` Jeff Garzik
  0 siblings, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2004-06-02 19:56 UTC (permalink / raw)
  To: Margit Schubert-While, Netdev

applied patches 1-5

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags
@ 2004-05-30 20:04 Margit Schubert-While
  2004-05-30 21:55 ` Luis R. Rodriguez
  0 siblings, 1 reply; 4+ messages in thread
From: Margit Schubert-While @ 2004-05-30 20:04 UTC (permalink / raw)
  To: netdev; +Cc: jgarzik

[-- Attachment #1: Type: text/plain, Size: 86 bytes --]

2004-05-29 Margit Schubert-While <margitsw@t-online.de>

* Remove CVS tags from source

[-- Attachment #2: 01-remove-cvstags.patch --]
[-- Type: application/octet-stream, Size: 7269 bytes --]

diff -Naur linux-2.6.6/drivers/net/wireless/prism54/isl_38xx.c linux-2.6.6-02/drivers/net/wireless/prism54/isl_38xx.c
--- linux-2.6.6/drivers/net/wireless/prism54/isl_38xx.c	2004-05-10 04:32:36.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/isl_38xx.c	2004-05-29 11:06:46.952408624 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_38xx.c,v 1.22 2004/02/28 03:06:07 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003-2004 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>_
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/isl_38xx.h linux-2.6.6-02/drivers/net/wireless/prism54/isl_38xx.h
--- linux-2.6.6/drivers/net/wireless/prism54/isl_38xx.h	2004-05-10 04:33:22.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/isl_38xx.h	2004-05-29 11:05:34.000000000 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_38xx.h,v 1.22 2004/02/28 03:06:07 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/isl_ioctl.c linux-2.6.6-02/drivers/net/wireless/prism54/isl_ioctl.c
--- linux-2.6.6/drivers/net/wireless/prism54/isl_ioctl.c	2004-05-10 04:32:27.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/isl_ioctl.c	2004-05-29 11:06:52.002640872 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.c,v 1.140 2004/02/28 03:06:07 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *            (C) 2003 Aurelien Alleaume <slts@free.fr>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/isl_ioctl.h linux-2.6.6-02/drivers/net/wireless/prism54/isl_ioctl.h
--- linux-2.6.6/drivers/net/wireless/prism54/isl_ioctl.h	2004-05-10 04:32:37.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/isl_ioctl.h	2004-05-29 11:05:40.000000000 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/isl_ioctl.h,v 1.30 2004/01/30 16:24:00 ajfa Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *            (C) 2003 Aurelien Alleaume <slts@free.fr>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/isl_oid.h linux-2.6.6-02/drivers/net/wireless/prism54/isl_oid.h
--- linux-2.6.6/drivers/net/wireless/prism54/isl_oid.h	2004-05-10 04:32:39.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/isl_oid.h	2004-05-29 11:09:22.954692672 +0200
@@ -1,8 +1,9 @@
 /*
- *  $Id: isl_oid.h,v 1.3 2004/03/09 09:05:27 mcgrof Exp $
+ *
  *  
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
  *  Copyright (C) 2004 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
+ *  Copyright (C) 2004 Aurelien Alleaume <slts@free.fr>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_dev.c linux-2.6.6-02/drivers/net/wireless/prism54/islpci_dev.c
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_dev.c	2004-05-10 04:31:58.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_dev.c	2004-05-29 11:06:59.267536440 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.68 2004/02/28 03:06:07 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_dev.h linux-2.6.6-02/drivers/net/wireless/prism54/islpci_dev.h
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_dev.h	2004-05-10 04:32:28.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_dev.h	2004-05-29 11:10:38.508206792 +0200
@@ -1,8 +1,9 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.h,v 1.53 2004/02/28 03:06:07 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc. 
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
  *  Copyright (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
+ *  Copyright (C) 2003 Aurelien Alleaume <slts@free.fr>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_eth.c linux-2.6.6-02/drivers/net/wireless/prism54/islpci_eth.c
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_eth.c	2004-05-10 04:32:00.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_eth.c	2004-05-29 11:07:05.380607112 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.c,v 1.27 2004/01/30 16:24:00 ajfa Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_eth.h linux-2.6.6-02/drivers/net/wireless/prism54/islpci_eth.h
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_eth.h	2004-05-10 04:33:19.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_eth.h	2004-05-29 11:06:22.399141288 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_eth.h,v 1.5 2004/01/12 22:16:32 jmaurer Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_hotplug.c linux-2.6.6-02/drivers/net/wireless/prism54/islpci_hotplug.c
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_hotplug.c	2004-05-10 04:32:29.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_hotplug.c	2004-05-29 11:07:10.195875080 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_hotplug.c,v 1.56 2004/02/26 23:33:02 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_mgt.c linux-2.6.6-02/drivers/net/wireless/prism54/islpci_mgt.c
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_mgt.c	2004-05-10 04:32:53.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_mgt.c	2004-05-29 11:07:14.061287448 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_mgt.c,v 1.40 2004/02/01 10:57:23 mcgrof Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright 2004 Jens Maurer <Jens.Maurer@gmx.net>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/islpci_mgt.h linux-2.6.6-02/drivers/net/wireless/prism54/islpci_mgt.h
--- linux-2.6.6/drivers/net/wireless/prism54/islpci_mgt.h	2004-05-10 04:32:02.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/islpci_mgt.h	2004-05-29 11:06:28.622195240 +0200
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_mgt.h,v 1.22 2004/01/30 16:24:00 ajfa Exp $
+/*
  *  
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Luis R. Rodriguez <mcgrof@ruslug.rutgers.edu>
diff -Naur linux-2.6.6/drivers/net/wireless/prism54/oid_mgt.h linux-2.6.6-02/drivers/net/wireless/prism54/oid_mgt.h
--- linux-2.6.6/drivers/net/wireless/prism54/oid_mgt.h	2004-05-10 04:33:20.000000000 +0200
+++ linux-2.6.6-02/drivers/net/wireless/prism54/oid_mgt.h	2004-05-29 11:06:39.086604408 +0200
@@ -1,4 +1,4 @@
-/*   
+/*
  *  Copyright (C) 2003 Aurelien Alleaume <slts@free.fr>
  *
  *  This program is free software; you can redistribute it and/or modify

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags
  2004-05-30 20:04 Margit Schubert-While
@ 2004-05-30 21:55 ` Luis R. Rodriguez
       [not found]   ` <40BA5A51.6070405@pobox.com>
  0 siblings, 1 reply; 4+ messages in thread
From: Luis R. Rodriguez @ 2004-05-30 21:55 UTC (permalink / raw)
  To: Margit Schubert-While; +Cc: netdev, jgarzik

On Sun, May 30, 2004 at 10:04:21PM +0200, Margit Schubert-While wrote:
> 2004-05-29 Margit Schubert-While <margitsw@t-online.de>
> 
> * Remove CVS tags from source

I believe what Jeff wanted was for all the patches to have these already
removed, not to remove them from the kernel tree, specifically.

Oh well, let's hope these get accepted, if not I'll fix 'm up.

	Luis

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

^ permalink raw reply	[flat|nested] 4+ messages in thread

[parent not found: <40BA5A51.6070405@pobox.com>]

* Re: [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags
       [not found]   ` <40BA5A51.6070405@pobox.com>
@ 2004-05-31  4:30     ` Luis R. Rodriguez
  0 siblings, 0 replies; 4+ messages in thread
From: Luis R. Rodriguez @ 2004-05-31  4:30 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Margit Schubert-While, netdev

On Sun, May 30, 2004 at 06:04:01PM -0400, Jeff Garzik wrote:
> Luis R. Rodriguez wrote:
> >On Sun, May 30, 2004 at 10:04:21PM +0200, Margit Schubert-While wrote:
> >
> >>2004-05-29 Margit Schubert-While <margitsw@t-online.de>
> >>
> >>* Remove CVS tags from source
> >
> >
> >I believe what Jeff wanted was for all the patches to have these already
> >removed, not to remove them from the kernel tree, specifically.
> 
> Margit interpreted me correctly...  As long as the CVS $tag$s are 
> present in the kernel tree, they will wind up leading to conflicts.

Ahh wonderful then :)

	Luis

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2004-06-02 19:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <200405310211.46049.margitsw@t-online.de>
2004-06-02 19:56 ` [PATCH 1/17 linux-2.6.7-rc2] prism54: delete cvs tags Jeff Garzik
2004-05-30 20:04 Margit Schubert-While
2004-05-30 21:55 ` Luis R. Rodriguez
     [not found]   ` <40BA5A51.6070405@pobox.com>
2004-05-31  4:30     ` Luis R. Rodriguez

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).