diff for duplicates of <20141125102451.GC23215@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index 1a06c4c..3b5acb7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,9 +11,13 @@ index c7859fc..7ce7a25 100644
 @@ -208,7 +208,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,
  	case KFD_QUEUE_TYPE_DIQ:
  		kq = kernel_queue_init(dev, KFD_QUEUE_TYPE_DIQ);
- 		if (kq = NULL) {
+ 		if (kq == NULL) {
 -			kernel_queue_uninit(kq);
 +			retval = -ENOMEM;
  			goto err_create_queue;
  		}
  		kq->queue->properties.queue_id = *qid;
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 9714cf5..75c7aca 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0[patch] amdkfd: fix an error handling bug in pqm_create_queue()\0"
- "Date\0Tue, 25 Nov 2014 10:24:51 +0000\0"
+ "Date\0Tue, 25 Nov 2014 13:24:51 +0300\0"
  "To\0Oded Gabbay <oded.gabbay@amd.com>"
  " Ben Goz <ben.goz@amd.com>\0"
  "Cc\0kernel-janitors@vger.kernel.org"
@@ -20,11 +20,15 @@
  "@@ -208,7 +208,7 @@ int pqm_create_queue(struct process_queue_manager *pqm,\n"
  " \tcase KFD_QUEUE_TYPE_DIQ:\n"
  " \t\tkq = kernel_queue_init(dev, KFD_QUEUE_TYPE_DIQ);\n"
- " \t\tif (kq = NULL) {\n"
+ " \t\tif (kq == NULL) {\n"
  "-\t\t\tkernel_queue_uninit(kq);\n"
  "+\t\t\tretval = -ENOMEM;\n"
  " \t\t\tgoto err_create_queue;\n"
  " \t\t}\n"
- " \t\tkq->queue->properties.queue_id = *qid;"
+ " \t\tkq->queue->properties.queue_id = *qid;\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-7da8e7ddae75fd46a9f49b19cab0031a046104951598480a699a1b43946071a3
+3762bb38a89100e04b21f45214a63d2ad8f0b6bd3278d8837b9108af348d22bb
