Index: tmp-2.6/drivers/infiniband/hw/nes/nes_verbs.c
===================================================================
--- tmp-2.6.orig/drivers/infiniband/hw/nes/nes_verbs.c
+++ tmp-2.6/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3908,16 +3908,8 @@ static void nes_unregister_ofa_device(st
 	struct nes_vnic *nesvnic = nesibdev->nesvnic;
 	int i;
 
-<<<<<<<
-	if (nesibdev == NULL)
-		return;
-
 	for (i = 0; i < ARRAY_SIZE(nes_dev_attributes); ++i) {
 		device_remove_file(&nesibdev->ibdev.dev, nes_dev_attributes[i]);
-=======
-	for (i = 0; i < ARRAY_SIZE(nes_class_attributes); ++i) {
-		class_device_remove_file(&nesibdev->ibdev.class_dev, nes_class_attributes[i]);
->>>>>>>
 	}
 
 	if (nesvnic->of_device_registered) {
Index: tmp-2.6/drivers/infiniband/hw/amso1100/c2_provider.c
===================================================================
--- tmp-2.6.orig/drivers/infiniband/hw/amso1100/c2_provider.c
+++ tmp-2.6/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -526,27 +526,16 @@ static int c2_dereg_mr(struct ib_mr *ib_
 static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
 			char *buf)
 {
-<<<<<<<
 	struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev);
-	pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
-	return sprintf(buf, "%x\n", c2dev->props.hw_ver);
-=======
-	struct c2_dev *dev = container_of(cdev, struct c2_dev, ibdev.class_dev);
 	pr_debug("%s:%u\n", __func__, __LINE__);
-	return sprintf(buf, "%x\n", dev->props.hw_ver);
->>>>>>>
+	return sprintf(buf, "%x\n", c2dev->props.hw_ver);
 }
 
 static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr,
 			   char *buf)
 {
-<<<<<<<
 	struct c2_dev *c2dev = container_of(dev, struct c2_dev, ibdev.dev);
-	pr_debug("%s:%u\n", __FUNCTION__, __LINE__);
-=======
-	struct c2_dev *dev = container_of(cdev, struct c2_dev, ibdev.class_dev);
 	pr_debug("%s:%u\n", __func__, __LINE__);
->>>>>>>
 	return sprintf(buf, "%x.%x.%x\n",
 		       (int) (c2dev->props.fw_ver >> 32),
 		       (int) (c2dev->props.fw_ver >> 16) & 0xffff,
Index: tmp-2.6/drivers/infiniband/hw/cxgb3/iwch_provider.c
===================================================================
--- tmp-2.6.orig/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ tmp-2.6/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -1044,17 +1044,10 @@ static int iwch_query_port(struct ib_dev
 static ssize_t show_rev(struct device *dev, struct device_attribute *attr,
 			char *buf)
 {
-<<<<<<<
 	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,
 						 ibdev.dev);
-	PDBG("%s dev 0x%p\n", __FUNCTION__, dev);
+	PDBG("%s dev 0x%p\n", __func__, dev);
 	return sprintf(buf, "%d\n", iwch_dev->rdev.t3cdev_p->type);
-=======
-	struct iwch_dev *dev = container_of(cdev, struct iwch_dev,
-					    ibdev.class_dev);
-	PDBG("%s class dev 0x%p\n", __func__, cdev);
-	return sprintf(buf, "%d\n", dev->rdev.t3cdev_p->type);
->>>>>>>
 }
 
 static ssize_t show_fw_ver(struct device *dev, struct device_attribute *attr, char *buf)
@@ -1064,12 +1057,8 @@ static ssize_t show_fw_ver(struct device
 	struct ethtool_drvinfo info;
 	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;
 
-<<<<<<<
-	PDBG("%s dev 0x%p\n", __FUNCTION__, dev);
-=======
-	PDBG("%s class dev 0x%p\n", __func__, cdev);
+	PDBG("%s dev 0x%p\n", __func__, dev);
 	rtnl_lock();
->>>>>>>
 	lldev->ethtool_ops->get_drvinfo(lldev, &info);
 	return sprintf(buf, "%s\n", info.fw_version);
 }
@@ -1082,12 +1071,8 @@ static ssize_t show_hca(struct device *d
 	struct ethtool_drvinfo info;
 	struct net_device *lldev = iwch_dev->rdev.t3cdev_p->lldev;
 
-<<<<<<<
-	PDBG("%s dev 0x%p\n", __FUNCTION__, dev);
-=======
-	PDBG("%s class dev 0x%p\n", __func__, cdev);
+	PDBG("%s dev 0x%p\n", __func__, dev);
 	rtnl_lock();
->>>>>>>
 	lldev->ethtool_ops->get_drvinfo(lldev, &info);
 	return sprintf(buf, "%s\n", info.driver);
 }
@@ -1095,19 +1080,11 @@ static ssize_t show_hca(struct device *d
 static ssize_t show_board(struct device *dev, struct device_attribute *attr,
 			  char *buf)
 {
-<<<<<<<
 	struct iwch_dev *iwch_dev = container_of(dev, struct iwch_dev,
 						 ibdev.dev);
-	PDBG("%s dev 0x%p\n", __FUNCTION__, dev);
+	PDBG("%s dev 0x%p\n", __func__, dev);
 	return sprintf(buf, "%x.%x\n", iwch_dev->rdev.rnic_info.pdev->vendor,
 		       iwch_dev->rdev.rnic_info.pdev->device);
-=======
-	struct iwch_dev *dev = container_of(cdev, struct iwch_dev,
-					    ibdev.class_dev);
-	PDBG("%s class dev 0x%p\n", __func__, dev);
-	return sprintf(buf, "%x.%x\n", dev->rdev.rnic_info.pdev->vendor,
-		                       dev->rdev.rnic_info.pdev->device);
->>>>>>>
 }
 
 static DEVICE_ATTR(hw_rev, S_IRUGO, show_rev, NULL);