public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0 of 2] Calgary: copyrights and MAINTAINERS updates
@ 2006-07-01 10:53 muli
  2006-07-01 10:53 ` [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines muli
  2006-07-01 10:53 ` [PATCH 2 of 2] Add a MAINTAINERS entry for Calgary muli
  0 siblings, 2 replies; 4+ messages in thread
From: muli @ 2006-07-01 10:53 UTC (permalink / raw)
  To: ak; +Cc: muli, jdmason, linux-kernel

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

Hi Andi,

Please apply these Calgary updates:

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

Thanks,
Muli

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

* [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines
  2006-07-01 10:53 [PATCH 0 of 2] Calgary: copyrights and MAINTAINERS updates muli
@ 2006-07-01 10:53 ` muli
  2006-07-04  8:16   ` Andi Kleen
  2006-07-01 10:53 ` [PATCH 2 of 2] Add a MAINTAINERS entry for Calgary muli
  1 sibling, 1 reply; 4+ messages in thread
From: muli @ 2006-07-01 10:53 UTC (permalink / raw)
  To: ak; +Cc: muli, jdmason, linux-kernel

# HG changeset patch
# User Muli Ben-Yehuda <muli@il.ibm.com>
# Node ID c4bd0cdcce626b9edc0b4fa3e94c8d9666cf977a
# Parent  c77454706594f66e8751656a28223db4aaef8a11
Fix Calgary copyright statements per IBM guidelines

Signed-Off-By: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-Off-By: Jon Mason <jdmason@us.ibm.com>

diff -r c77454706594 -r c4bd0cdcce62 arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c	Sat Jul 01 13:36:55 2006 +0300
+++ b/arch/x86_64/kernel/pci-calgary.c	Sat Jul 01 13:39:52 2006 +0300
@@ -1,9 +1,11 @@
 /*
  * Derived from arch/powerpc/kernel/iommu.c
  *
- * Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
  *
+ * Author: Jon Mason <jdmason@us.ibm.com>
+ * Author: Muli Ben-Yehuda <muli@il.ibm.com>
+
  * 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
diff -r c77454706594 -r c4bd0cdcce62 arch/x86_64/kernel/tce.c
--- a/arch/x86_64/kernel/tce.c	Sat Jul 01 13:36:55 2006 +0300
+++ b/arch/x86_64/kernel/tce.c	Sat Jul 01 13:39:52 2006 +0300
@@ -1,8 +1,10 @@
 /*
  * Derived from arch/powerpc/platforms/pseries/iommu.c
  *
- * Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <jdmason@us.ibm.com>
+ * Author: Muli Ben-Yehuda <muli@il.ibm.com>
  *
  * 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 -r c77454706594 -r c4bd0cdcce62 include/asm-x86_64/calgary.h
--- a/include/asm-x86_64/calgary.h	Sat Jul 01 13:36:55 2006 +0300
+++ b/include/asm-x86_64/calgary.h	Sat Jul 01 13:39:52 2006 +0300
@@ -1,8 +1,10 @@
 /*
  * Derived from include/asm-powerpc/iommu.h
  *
- * Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <jdmason@us.ibm.com>
+ * Author: Muli Ben-Yehuda <muli@il.ibm.com>
  *
  * 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 -r c77454706594 -r c4bd0cdcce62 include/asm-x86_64/tce.h
--- a/include/asm-x86_64/tce.h	Sat Jul 01 13:36:55 2006 +0300
+++ b/include/asm-x86_64/tce.h	Sat Jul 01 13:39:52 2006 +0300
@@ -1,8 +1,10 @@
 /*
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation
- * Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, 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 <muli@il.ibm.com>
+ * Author: Jon Mason <jdmason@us.ibm.com>
  *
  * 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

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

* [PATCH 2 of 2] Add a MAINTAINERS entry for Calgary
  2006-07-01 10:53 [PATCH 0 of 2] Calgary: copyrights and MAINTAINERS updates muli
  2006-07-01 10:53 ` [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines muli
@ 2006-07-01 10:53 ` muli
  1 sibling, 0 replies; 4+ messages in thread
From: muli @ 2006-07-01 10:53 UTC (permalink / raw)
  To: ak; +Cc: muli, jdmason, linux-kernel

# HG changeset patch
# User Muli Ben-Yehuda <muli@il.ibm.com>
# Node ID fb5f1c67954816b63e542ea4d80f5a2b294ca10c
# Parent  c4bd0cdcce626b9edc0b4fa3e94c8d9666cf977a
Add a MAINTAINERS entry for Calgary

Signed-Off-By: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-Off-By: Jon Mason <jdmason@us.ibm.com>

diff -r c4bd0cdcce62 -r fb5f1c679548 MAINTAINERS
--- a/MAINTAINERS	Sat Jul 01 13:39:52 2006 +0300
+++ b/MAINTAINERS	Sat Jul 01 13:40:56 2006 +0300
@@ -606,6 +606,15 @@ L:	video4linux-list@redhat.com
 L:	video4linux-list@redhat.com
 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:	muli@il.ibm.com
+P:	Jon D. Mason
+M:	jdmason@us.ibm.com
+L:	linux-kernel@vger.kernel.org
+L:	discuss@x86-64.org
 S:	Maintained
 
 COMMON INTERNET FILE SYSTEM (CIFS)

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

* Re: [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines
  2006-07-01 10:53 ` [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines muli
@ 2006-07-04  8:16   ` Andi Kleen
  0 siblings, 0 replies; 4+ messages in thread
From: Andi Kleen @ 2006-07-04  8:16 UTC (permalink / raw)
  To: muli; +Cc: jdmason, linux-kernel

On Saturday 01 July 2006 12:53, muli@il.ibm.com wrote:
> # HG changeset patch
> # User Muli Ben-Yehuda <muli@il.ibm.com>
> # 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

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

end of thread, other threads:[~2006-07-04  8:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-01 10:53 [PATCH 0 of 2] Calgary: copyrights and MAINTAINERS updates muli
2006-07-01 10:53 ` [PATCH 1 of 2] Fix Calgary copyright statements per IBM guidelines muli
2006-07-04  8:16   ` Andi Kleen
2006-07-01 10:53 ` [PATCH 2 of 2] Add a MAINTAINERS entry for Calgary muli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox