diff for duplicates of <e216f8cba5b81587b0c8300e9384e8efc12aa22b.1487314667.git.joe@perches.com>
diff --git a/a/1.txt b/N1/1.txt
index 899bcc3..029652d 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -50,7 +50,7 @@ index ef73f14d7ba0..b21a89b03fb4 100644
@@ -645,7 +645,7 @@ static void overlay1fb_disable(struct pxafb_layer *ofb)
lcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3);
- if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)
+ if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) = 0)
- pr_warning("%s: timeout disabling overlay1\n", __func__);
+ pr_warn("%s: timeout disabling overlay1\n", __func__);
@@ -59,7 +59,7 @@ index ef73f14d7ba0..b21a89b03fb4 100644
@@ -710,7 +710,7 @@ static void overlay2fb_disable(struct pxafb_layer *ofb)
lcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3);
- if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)
+ if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) = 0)
- pr_warning("%s: timeout disabling overlay2\n", __func__);
+ pr_warn("%s: timeout disabling overlay2\n", __func__);
}
@@ -68,7 +68,7 @@ index ef73f14d7ba0..b21a89b03fb4 100644
@@ -1187,8 +1187,7 @@ int pxafb_smart_flush(struct fb_info *info)
lcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB);
- if (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) {
+ if (wait_for_completion_timeout(&fbi->command_done, HZ/2) = 0) {
- pr_warning("%s: timeout waiting for command done\n",
- __func__);
+ pr_warn("%s: timeout waiting for command done\n", __func__);
diff --git a/a/content_digest b/N1/content_digest
index 10d1714..4359492 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 32/35] drivers/video: Convert remaining uses of pr_warning to pr_warn\0"
]
[
- "Date\0Thu, 16 Feb 2017 23:11:45 -0800\0"
+ "Date\0Fri, 17 Feb 2017 07:11:45 +0000\0"
]
[
"To\0Benjamin Herrenschmidt <benh\@kernel.crashing.org>\0"
@@ -77,7 +77,7 @@
"\@\@ -645,7 +645,7 \@\@ static void overlay1fb_disable(struct pxafb_layer *ofb)\n",
" \tlcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3);\n",
" \n",
- " \tif (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)\n",
+ " \tif (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) = 0)\n",
"-\t\tpr_warning(\"%s: timeout disabling overlay1\\n\", __func__);\n",
"+\t\tpr_warn(\"%s: timeout disabling overlay1\\n\", __func__);\n",
" \n",
@@ -86,7 +86,7 @@
"\@\@ -710,7 +710,7 \@\@ static void overlay2fb_disable(struct pxafb_layer *ofb)\n",
" \tlcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3);\n",
" \n",
- " \tif (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)\n",
+ " \tif (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) = 0)\n",
"-\t\tpr_warning(\"%s: timeout disabling overlay2\\n\", __func__);\n",
"+\t\tpr_warn(\"%s: timeout disabling overlay2\\n\", __func__);\n",
" }\n",
@@ -95,7 +95,7 @@
"\@\@ -1187,8 +1187,7 \@\@ int pxafb_smart_flush(struct fb_info *info)\n",
" \tlcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB);\n",
" \n",
- " \tif (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) {\n",
+ " \tif (wait_for_completion_timeout(&fbi->command_done, HZ/2) = 0) {\n",
"-\t\tpr_warning(\"%s: timeout waiting for command done\\n\",\n",
"-\t\t\t\t__func__);\n",
"+\t\tpr_warn(\"%s: timeout waiting for command done\\n\", __func__);\n",
@@ -106,4 +106,4 @@
"2.10.0.rc2.1.g053435c"
]
-00d3f202b9aec24b9a2f7e67b576adc51ef56aa18ab98d38f662313ac1c40a1f
+c0b7d702a36f20b22cd6cacb2e9f61ddf6b847d568c680a5d291ce0d158c60b9
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.