From 2944f941137086e27cd1f057c023cacb2f4dc054 Mon Sep 17 00:00:00 2001
From: phil <phil>
Date: Sun, 21 Dec 2003 07:41:47 +0000
Subject: [PATCH] Remove pesky $Id tag which only causes conflicts

---
 lnet/include/cygwin-ioctl.h           | 3 +--
 lustre/portals/include/cygwin-ioctl.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lnet/include/cygwin-ioctl.h b/lnet/include/cygwin-ioctl.h
index 900f0a42d0..8a33957adb 100644
--- a/lnet/include/cygwin-ioctl.h
+++ b/lnet/include/cygwin-ioctl.h
@@ -1,5 +1,4 @@
-/* $Id: cygwin-ioctl.h,v 1.3 2003/12/03 05:12:41 phil Exp $
- *
+/*
  * linux/ioctl.h for Linux by H.H. Bergman.
  */
 
diff --git a/lustre/portals/include/cygwin-ioctl.h b/lustre/portals/include/cygwin-ioctl.h
index 900f0a42d0..8a33957adb 100644
--- a/lustre/portals/include/cygwin-ioctl.h
+++ b/lustre/portals/include/cygwin-ioctl.h
@@ -1,5 +1,4 @@
-/* $Id: cygwin-ioctl.h,v 1.3 2003/12/03 05:12:41 phil Exp $
- *
+/*
  * linux/ioctl.h for Linux by H.H. Bergman.
  */
 
-- 
GitLab