The patch titled
x86_64: Fix Calgary copyright statements per IBM guidelines
has been removed from the -mm tree. Its filename is
x86_64-fix-calgary-copyright-statements-per-ibm-guidelines.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86_64: Fix Calgary copyright statements per IBM guidelines
From: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Fix Calgary copyright statements per IBM guidelines
Signed-off-by: Muli Ben-Yehuda <muli@xxxxxxxxxx>
Signed-off-by: Jon Mason <jdmason@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/pci-calgary.c | 6 ++++--
arch/x86_64/kernel/tce.c | 6 ++++--
include/asm-x86_64/calgary.h | 6 ++++--
include/asm-x86_64/tce.h | 8 +++++---
4 files changed, 17 insertions(+), 9 deletions(-)
diff -puN arch/x86_64/kernel/pci-calgary.c~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines
+++ a/arch/x86_64/kernel/pci-calgary.c
@@ -1,9 +1,11 @@
/*
* Derived from arch/powerpc/kernel/iommu.c
*
- * Copyright (C) 2006 Jon Mason <jdmason@xxxxxxxxxx>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@xxxxxxxxxx>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
*
+ * Author: Jon Mason <jdmason@xxxxxxxxxx>
+ * Author: Muli Ben-Yehuda <muli@xxxxxxxxxx>
+
* 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 -puN arch/x86_64/kernel/tce.c~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines arch/x86_64/kernel/tce.c
--- a/arch/x86_64/kernel/tce.c~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines
+++ a/arch/x86_64/kernel/tce.c
@@ -1,8 +1,10 @@
/*
* Derived from arch/powerpc/platforms/pseries/iommu.c
*
- * Copyright (C) 2006 Jon Mason <jdmason@xxxxxxxxxx>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@xxxxxxxxxx>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <jdmason@xxxxxxxxxx>
+ * Author: Muli Ben-Yehuda <muli@xxxxxxxxxx>
*
* 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 -puN include/asm-x86_64/calgary.h~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines include/asm-x86_64/calgary.h
--- a/include/asm-x86_64/calgary.h~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines
+++ a/include/asm-x86_64/calgary.h
@@ -1,8 +1,10 @@
/*
* Derived from include/asm-powerpc/iommu.h
*
- * Copyright (C) 2006 Jon Mason <jdmason@xxxxxxxxxx>, IBM Corporation
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@xxxxxxxxxx>, IBM Corporation
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Jon Mason <jdmason@xxxxxxxxxx>
+ * Author: Muli Ben-Yehuda <muli@xxxxxxxxxx>
*
* 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 -puN include/asm-x86_64/tce.h~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines include/asm-x86_64/tce.h
--- a/include/asm-x86_64/tce.h~x86_64-fix-calgary-copyright-statements-per-ibm-guidelines
+++ a/include/asm-x86_64/tce.h
@@ -1,9 +1,11 @@
/*
- * Copyright (C) 2006 Muli Ben-Yehuda <muli@xxxxxxxxxx>, IBM Corporation
- * Copyright (C) 2006 Jon Mason <jdmason@xxxxxxxxxx>, IBM Corporation
- *
* This file is derived from asm-powerpc/tce.h.
*
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Author: Muli Ben-Yehuda <muli@xxxxxxxxxx>
+ * Author: Jon Mason <jdmason@xxxxxxxxxx>
+ *
* 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
_
Patches currently in -mm which might be from muli@xxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
