The patch titled
IB/ipath: update copyrights and other strings to reflect new company name
has been removed from the -mm tree. Its filename is
ib-ipath-update-copyrights-and-other-strings-to.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: IB/ipath: update copyrights and other strings to reflect new company name
From: "Bryan O'Sullivan" <bos@xxxxxxxxxxxxx>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@xxxxxxxxxx>
Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxxxxxx>
Cc: Roland Dreier <rolandd@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/infiniband/hw/ipath/Kconfig | 8 ++++----
drivers/infiniband/hw/ipath/Makefile | 2 +-
drivers/infiniband/hw/ipath/ipath_common.h | 7 ++++---
drivers/infiniband/hw/ipath/ipath_cq.c | 1 +
drivers/infiniband/hw/ipath/ipath_debug.h | 1 +
drivers/infiniband/hw/ipath/ipath_diag.c | 1 +
drivers/infiniband/hw/ipath/ipath_driver.c | 9 +++++----
drivers/infiniband/hw/ipath/ipath_eeprom.c | 1 +
drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
drivers/infiniband/hw/ipath/ipath_fs.c | 1 +
drivers/infiniband/hw/ipath/ipath_ht400.c | 1 +
drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 +
drivers/infiniband/hw/ipath/ipath_intr.c | 1 +
drivers/infiniband/hw/ipath/ipath_kernel.h | 1 +
drivers/infiniband/hw/ipath/ipath_keys.c | 1 +
drivers/infiniband/hw/ipath/ipath_layer.c | 1 +
drivers/infiniband/hw/ipath/ipath_layer.h | 1 +
drivers/infiniband/hw/ipath/ipath_mad.c | 1 +
drivers/infiniband/hw/ipath/ipath_mr.c | 1 +
drivers/infiniband/hw/ipath/ipath_pe800.c | 3 ++-
drivers/infiniband/hw/ipath/ipath_qp.c | 1 +
drivers/infiniband/hw/ipath/ipath_rc.c | 1 +
drivers/infiniband/hw/ipath/ipath_registers.h | 1 +
drivers/infiniband/hw/ipath/ipath_ruc.c | 1 +
drivers/infiniband/hw/ipath/ipath_srq.c | 1 +
drivers/infiniband/hw/ipath/ipath_stats.c | 1 +
drivers/infiniband/hw/ipath/ipath_sysfs.c | 1 +
drivers/infiniband/hw/ipath/ipath_uc.c | 1 +
drivers/infiniband/hw/ipath/ipath_ud.c | 1 +
drivers/infiniband/hw/ipath/ipath_user_pages.c | 1 +
drivers/infiniband/hw/ipath/ipath_verbs.c | 5 +++--
drivers/infiniband/hw/ipath/ipath_verbs.h | 1 +
drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 1 +
drivers/infiniband/hw/ipath/ipath_wc_x86_64.c | 1 +
drivers/infiniband/hw/ipath/ips_common.h | 1 +
drivers/infiniband/hw/ipath/verbs_debug.h | 1 +
36 files changed, 49 insertions(+), 15 deletions(-)
diff -puN drivers/infiniband/hw/ipath/ipath_common.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_common.h
--- a/drivers/infiniband/hw/ipath/ipath_common.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_common.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
@@ -38,7 +39,7 @@
* to communicate between kernel and user code.
*/
-/* This is the IEEE-assigned OUI for PathScale, Inc. */
+/* This is the IEEE-assigned OUI for QLogic, Inc. InfiniPath */
#define IPATH_SRC_OUI_1 0x00
#define IPATH_SRC_OUI_2 0x11
#define IPATH_SRC_OUI_3 0x75
@@ -342,9 +343,9 @@ struct ipath_base_info {
/*
* Similarly, this is the kernel version going back to the user. It's
* slightly different, in that we want to tell if the driver was built as
- * part of a PathScale release, or from the driver from OpenIB, kernel.org,
+ * part of a QLogic release, or from the driver from OpenIB, kernel.org,
* or a standard distribution, for support reasons. The high bit is 0 for
- * non-PathScale, and 1 for PathScale-built/supplied.
+ * non-QLogic, and 1 for QLogic-built/supplied.
*
* It's returned by the driver to the user code during initialization in the
* spi_sw_version field of ipath_base_info, so the user code can in turn
diff -puN drivers/infiniband/hw/ipath/ipath_cq.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_cq.c
--- a/drivers/infiniband/hw/ipath/ipath_cq.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_cq.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_debug.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_debug.h
--- a/drivers/infiniband/hw/ipath/ipath_debug.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_debug.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_diag.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_diag.c
--- a/drivers/infiniband/hw/ipath/ipath_diag.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_driver.c
--- a/drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
@@ -52,7 +53,7 @@ const char *ipath_get_unit_name(int unit
EXPORT_SYMBOL_GPL(ipath_get_unit_name);
-#define DRIVER_LOAD_MSG "PathScale " IPATH_DRV_NAME " loaded: "
+#define DRIVER_LOAD_MSG "QLogic " IPATH_DRV_NAME " loaded: "
#define PFX IPATH_DRV_NAME ": "
/*
@@ -74,8 +75,8 @@ MODULE_PARM_DESC(debug, "mask for debug
EXPORT_SYMBOL_GPL(ipath_debug);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("PathScale <support@xxxxxxxxxxxxx>");
-MODULE_DESCRIPTION("Pathscale InfiniPath driver");
+MODULE_AUTHOR("QLogic <support@xxxxxxxxxxxxx>");
+MODULE_DESCRIPTION("QLogic InfiniPath driver");
const char *ipath_ibcstatus_str[] = {
"Disabled",
@@ -452,7 +453,7 @@ static int __devinit ipath_init_one(stru
ipath_init_pe800_funcs(dd);
break;
default:
- ipath_dev_err(dd, "Found unknown PathScale deviceid 0x%x, "
+ ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
"failing\n", ent->device);
return -ENODEV;
}
diff -puN drivers/infiniband/hw/ipath/ipath_eeprom.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_eeprom.c
--- a/drivers/infiniband/hw/ipath/ipath_eeprom.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_eeprom.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_file_ops.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_file_ops.c
--- a/drivers/infiniband/hw/ipath/ipath_file_ops.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_file_ops.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_fs.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_fs.c
--- a/drivers/infiniband/hw/ipath/ipath_fs.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_ht400.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_ht400.c
--- a/drivers/infiniband/hw/ipath/ipath_ht400.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_ht400.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_init_chip.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_init_chip.c
--- a/drivers/infiniband/hw/ipath/ipath_init_chip.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_intr.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_intr.c
--- a/drivers/infiniband/hw/ipath/ipath_intr.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_kernel.h
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -1,6 +1,7 @@
#ifndef _IPATH_KERNEL_H
#define _IPATH_KERNEL_H
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_keys.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_keys.c
--- a/drivers/infiniband/hw/ipath/ipath_keys.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_keys.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_layer.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_layer.c
--- a/drivers/infiniband/hw/ipath/ipath_layer.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_layer.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_layer.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_layer.h
--- a/drivers/infiniband/hw/ipath/ipath_layer.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_layer.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_mad.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_mad.c
--- a/drivers/infiniband/hw/ipath/ipath_mad.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_mr.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_mr.c
--- a/drivers/infiniband/hw/ipath/ipath_mr.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_mr.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_pe800.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_pe800.c
--- a/drivers/infiniband/hw/ipath/ipath_pe800.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_pe800.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
@@ -44,7 +45,7 @@
/*
* This file contains all the chip-specific register information and
- * access functions for the PathScale PE800, the PCI-Express chip.
+ * access functions for the QLogic InfiniPath PE800, the PCI-Express chip.
*
* This lists the InfiniPath PE800 registers, in the actual chip layout.
* This structure should never be directly accessed.
diff -puN drivers/infiniband/hw/ipath/ipath_qp.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_qp.c
--- a/drivers/infiniband/hw/ipath/ipath_qp.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_qp.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_rc.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_rc.c
--- a/drivers/infiniband/hw/ipath/ipath_rc.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_registers.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_registers.h
--- a/drivers/infiniband/hw/ipath/ipath_registers.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_registers.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_ruc.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_ruc.c
--- a/drivers/infiniband/hw/ipath/ipath_ruc.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_ruc.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_srq.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_srq.c
--- a/drivers/infiniband/hw/ipath/ipath_srq.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_srq.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_stats.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_stats.c
--- a/drivers/infiniband/hw/ipath/ipath_stats.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_stats.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_sysfs.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_sysfs.c
--- a/drivers/infiniband/hw/ipath/ipath_sysfs.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_sysfs.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_uc.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_uc.c
--- a/drivers/infiniband/hw/ipath/ipath_uc.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_uc.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_ud.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_ud.c
--- a/drivers/infiniband/hw/ipath/ipath_ud.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_user_pages.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_user_pages.c
--- a/drivers/infiniband/hw/ipath/ipath_user_pages.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_user_pages.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_verbs.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_verbs.c
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
@@ -56,8 +57,8 @@ module_param_named(debug, ib_ipath_debug
MODULE_PARM_DESC(debug, "Verbs debug mask");
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("PathScale <support@xxxxxxxxxxxxx>");
-MODULE_DESCRIPTION("Pathscale InfiniPath driver");
+MODULE_AUTHOR("QLogic <support@xxxxxxxxxxxxx>");
+MODULE_DESCRIPTION("QLogic InfiniPath driver");
const int ib_ipath_state_ops[IB_QPS_ERR + 1] = {
[IB_QPS_RESET] = 0,
diff -puN drivers/infiniband/hw/ipath/ipath_verbs.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_verbs.h
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_verbs_mcast.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
--- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ipath_wc_x86_64.c~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ipath_wc_x86_64.c
--- a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ipath_wc_x86_64.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/ips_common.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/ips_common.h
--- a/drivers/infiniband/hw/ipath/ips_common.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/ips_common.h
@@ -1,6 +1,7 @@
#ifndef IPS_COMMON_H
#define IPS_COMMON_H
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
diff -puN drivers/infiniband/hw/ipath/Kconfig~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/Kconfig
--- a/drivers/infiniband/hw/ipath/Kconfig~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/Kconfig
@@ -1,16 +1,16 @@
config IPATH_CORE
- tristate "PathScale InfiniPath Driver"
+ tristate "QLogic InfiniPath Driver"
depends on 64BIT && PCI_MSI && NET
---help---
- This is a low-level driver for PathScale InfiniPath host channel
+ This is a low-level driver for QLogic InfiniPath host channel
adapters (HCAs) based on the HT-400 and PE-800 chips.
config INFINIBAND_IPATH
- tristate "PathScale InfiniPath Verbs Driver"
+ tristate "QLogic InfiniPath Verbs Driver"
depends on IPATH_CORE && INFINIBAND
---help---
This is a driver that provides InfiniBand verbs support for
- PathScale InfiniPath host channel adapters (HCAs). This
+ QLogic InfiniPath host channel adapters (HCAs). This
allows these devices to be used with both kernel upper level
protocols such as IP-over-InfiniBand as well as with userspace
applications (in conjunction with InfiniBand userspace access).
diff -puN drivers/infiniband/hw/ipath/Makefile~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/Makefile
--- a/drivers/infiniband/hw/ipath/Makefile~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/Makefile
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -DIPATH_IDSTR='"PathScale kernel.org driver"' \
+EXTRA_CFLAGS += -DIPATH_IDSTR='"QLogic kernel.org driver"' \
-DIPATH_KERN_TYPE=0
obj-$(CONFIG_IPATH_CORE) += ipath_core.o
diff -puN drivers/infiniband/hw/ipath/verbs_debug.h~ib-ipath-update-copyrights-and-other-strings-to drivers/infiniband/hw/ipath/verbs_debug.h
--- a/drivers/infiniband/hw/ipath/verbs_debug.h~ib-ipath-update-copyrights-and-other-strings-to
+++ a/drivers/infiniband/hw/ipath/verbs_debug.h
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2006 QLogic, Inc. All rights reserved.
* Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
_
Patches currently in -mm which might be from bos@xxxxxxxxxxxxx are
origin.patch
ib-ipath-fixes-a-bug-where-our-delay-for-eeprom-no.patch
-
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
