Skip to contentSkip to conversation

Calgary: copyrights and MAINTAINERS updates

PATCH New [email protected] 2 participants 4 messages Jul 1, 2006 – Jul 4, 2006

lore
Share & tools
lore
author
#1 lore raw

PATCH 1/1 Fix Calgary copyright statements per IBM guidelines

In reply to [email protected]

# HG changeset patch
# User Muli Ben-Yehuda <[email protected]>
# Node ID c4bd0cdcce626b9edc0b4fa3e94c8d9666cf977a # Parent c77454706594f66e8751656a28223db4aaef8a11 Fix Calgary copyright statements per IBM guidelines

Signed-off-by Muli Ben-Yehuda <[email protected]>
Signed-off-by Jon Mason <[email protected]>
arch/x86_64/kernel/pci-calgary.c +4 -2
diff -r c77454706594 -r c4bd0cdcce62 arch/x86_64/kernel/pci-calgary.c
@@ -1,9 +1,11 @@
 /*
  * Derived from arch/powerpc/kernel/iommu.c
  *
- * Copyright (C) 2006 Jon Mason <[email protected]>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <[email protected]>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
  *
+ * Author: Jon Mason <[email protected]>
+ * Author: Muli Ben-Yehuda <[email protected]>
+
  * 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
  * the Free Software Foundation; either version 2 of the License, or
arch/x86_64/kernel/tce.c +4 -2
diff -r c77454706594 -r c4bd0cdcce62 arch/x86_64/kernel/tce.c
@@ -1,8 +1,10 @@
 /*
  * Derived from arch/powerpc/platforms/pseries/iommu.c
  *
- * Copyright (C) 2006 Jon Mason <[email protected]>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <[email protected]>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <[email protected]>
+ * Author: Muli Ben-Yehuda <[email protected]>
  *
  * 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
include/asm-x86_64/calgary.h +4 -2
diff -r c77454706594 -r c4bd0cdcce62 include/asm-x86_64/calgary.h
@@ -1,8 +1,10 @@
 /*
  * Derived from include/asm-powerpc/iommu.h
  *
- * Copyright (C) 2006 Jon Mason <[email protected]>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <[email protected]>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <[email protected]>
+ * Author: Muli Ben-Yehuda <[email protected]>
  *
  * 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
include/asm-x86_64/tce.h +5 -3
diff -r c77454706594 -r c4bd0cdcce62 include/asm-x86_64/tce.h
@@ -1,8 +1,10 @@
 /*
- * Copyright (C) 2006 Muli Ben-Yehuda <[email protected]>, IBM Corporation
- * Copyright (C) 2006 Jon Mason <[email protected]>, IBM Corporation
+ * This file is derived from asm-powerpc/tce.h.
  *
- * This file is derived from asm-powerpc/tce.h.
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Muli Ben-Yehuda <[email protected]>
+ * Author: Jon Mason <[email protected]>
  *
  * 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

[email protected]

author
#0 lore raw

PATCH 1/1 Calgary: copyrights and MAINTAINERS updates

Hi Andi,

Please apply these Calgary updates:

- update copyright statements according to IBM's fearsome lawyers
- add a MAINTAINERS entry

Thanks,
Muli

author
#3 lore raw

PATCH 1/1 Add a MAINTAINERS entry for Calgary

# HG changeset patch
# User Muli Ben-Yehuda <[email protected]>
# Node ID fb5f1c67954816b63e542ea4d80f5a2b294ca10c # Parent c4bd0cdcce626b9edc0b4fa3e94c8d9666cf977a Add a MAINTAINERS entry for Calgary

Signed-off-by Muli Ben-Yehuda <[email protected]>
Signed-off-by Jon Mason <[email protected]>
MAINTAINERS +9 -0
diff -r c4bd0cdcce62 -r fb5f1c679548 MAINTAINERS
@@ -606,6 +606,15 @@ L:	[email protected]
 L:	[email protected]
 W:	http://linuxtv.org
 T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
+S:	Maintained
+
+CALGARY x86-64 IOMMU
+P:	Muli Ben-Yehuda
+M:	[email protected]
+P:	Jon D. Mason
+M:	[email protected]
+L:	[email protected]
+L:	[email protected]
 S:	Maintained
 
 COMMON INTERNET FILE SYSTEM (CIFS)
#2 lore raw

Re: [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines

In reply to [email protected]
Quoted 5 lines · On Saturday 01 July 2006 12:53, [email protected] wrote:

# HG changeset patch
# User Muli Ben-Yehuda <[email protected]>
# Node ID c4bd0cdcce626b9edc0b4fa3e94c8d9666cf977a # Parent c77454706594f66e8751656a28223db4aaef8a11 Fix Calgary copyright statements per IBM guidelines

Added thanks. However if you change the copyright again I'll balk.

-Andi