All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <87ha4biv1t.fsf@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 5c07e6e..6c12638 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,7 +20,7 @@ Reviewed-by: Jani Nikula <jani.nikula@intel.com>
 > @@ -3228,10 +3228,9 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
 >  
 >  			/* Speaker Allocation Data Block */
->  			if (dbl = 3) {
+>  			if (dbl == 3) {
 > -				*sadb = kmalloc(dbl, GFP_KERNEL);
 > +				*sadb = kmemdup(&db[1], dbl, GFP_KERNEL);
 >  				if (!*sadb)
diff --git a/a/content_digest b/N1/content_digest
index 175c502..2c7a86f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
  "ref\01401117687-28911-14-git-send-email-benoit.taine@lip6.fr\0"
  "From\0Jani Nikula <jani.nikula@linux.intel.com>\0"
  "Subject\0Re: [PATCH 13/18] drm/edid: Use kmemdup instead of kmalloc + memcpy\0"
- "Date\0Tue, 27 May 2014 06:40:14 +0000\0"
+ "Date\0Tue, 27 May 2014 09:40:14 +0300\0"
  "To\0David Airlie <airlied@linux.ie>\0"
  "Cc\0benoit.taine@lip6.fr"
   kernel-janitors@vger.kernel.org
@@ -32,7 +32,7 @@
  "> @@ -3228,10 +3228,9 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)\n"
  ">  \n"
  ">  \t\t\t/* Speaker Allocation Data Block */\n"
- ">  \t\t\tif (dbl = 3) {\n"
+ ">  \t\t\tif (dbl == 3) {\n"
  "> -\t\t\t\t*sadb = kmalloc(dbl, GFP_KERNEL);\n"
  "> +\t\t\t\t*sadb = kmemdup(&db[1], dbl, GFP_KERNEL);\n"
  ">  \t\t\t\tif (!*sadb)\n"
@@ -50,4 +50,4 @@
  "-- \n"
  Jani Nikula, Intel Open Source Technology Center
 
-8243622d26c8b1f3332ddaae68aeebcd597b38fe74d9582246d4289db1e3a5bf
+39d3780c4f26cdadead0d5fb8cb815e4cfb0542ae19416b557e095e14c738180

diff --git a/a/1.txt b/N2/1.txt
index 5c07e6e..6c12638 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -20,7 +20,7 @@ Reviewed-by: Jani Nikula <jani.nikula@intel.com>
 > @@ -3228,10 +3228,9 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
 >  
 >  			/* Speaker Allocation Data Block */
->  			if (dbl = 3) {
+>  			if (dbl == 3) {
 > -				*sadb = kmalloc(dbl, GFP_KERNEL);
 > +				*sadb = kmemdup(&db[1], dbl, GFP_KERNEL);
 >  				if (!*sadb)
diff --git a/a/content_digest b/N2/content_digest
index 175c502..cf7a72f 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,8 +2,9 @@
  "ref\01401117687-28911-14-git-send-email-benoit.taine@lip6.fr\0"
  "From\0Jani Nikula <jani.nikula@linux.intel.com>\0"
  "Subject\0Re: [PATCH 13/18] drm/edid: Use kmemdup instead of kmalloc + memcpy\0"
- "Date\0Tue, 27 May 2014 06:40:14 +0000\0"
- "To\0David Airlie <airlied@linux.ie>\0"
+ "Date\0Tue, 27 May 2014 09:40:14 +0300\0"
+ "To\0Benoit Taine <benoit.taine@lip6.fr>"
+ " David Airlie <airlied@linux.ie>\0"
  "Cc\0benoit.taine@lip6.fr"
   kernel-janitors@vger.kernel.org
   linux-kernel@vger.kernel.org
@@ -32,7 +33,7 @@
  "> @@ -3228,10 +3228,9 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)\n"
  ">  \n"
  ">  \t\t\t/* Speaker Allocation Data Block */\n"
- ">  \t\t\tif (dbl = 3) {\n"
+ ">  \t\t\tif (dbl == 3) {\n"
  "> -\t\t\t\t*sadb = kmalloc(dbl, GFP_KERNEL);\n"
  "> +\t\t\t\t*sadb = kmemdup(&db[1], dbl, GFP_KERNEL);\n"
  ">  \t\t\t\tif (!*sadb)\n"
@@ -50,4 +51,4 @@
  "-- \n"
  Jani Nikula, Intel Open Source Technology Center
 
-8243622d26c8b1f3332ddaae68aeebcd597b38fe74d9582246d4289db1e3a5bf
+694fc3178efaca8aee69ff2f22521aff47bfb6b029cf51d7696d5ddd224af905

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.