diff for duplicates of <1607392202.23328.1.camel@mhfsdcap03>

diff --git a/a/1.txt b/N1/1.txt
index 21c7f3e..5933a99 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,38 +1,29 @@
-On Mon, 2020-12-07 at 15:09 +0000, Colin King wrote:
-> From: Colin Ian King <colin.king@canonical.com>
-> 
-> Currently there is a null pointer check for hdmi_phy that implies it
-> may be null, however a dev_err messages dereferences this potential null
-> pointer.  Avoid a null pointer dereference by only emitting the dev_err
-> message if hdmi_phy is non-null.  It is a moot point if the error message
-> needs to be printed at all, but since this is a relatively new piece of
-> code it may be useful to keep the message in for the moment in case there
-> are unforseen errors that need to be reported.
-> 
-> Addresses-Coverity: ("Dereference after null check")
-> Fixes: be28b6507c46 ("drm/mediatek: separate hdmi phy to different file")
-> Signed-off-by: Colin Ian King <colin.king@canonical.com>
-> ---
->  drivers/phy/mediatek/phy-mtk-hdmi.c | 5 +++--
->  1 file changed, 3 insertions(+), 2 deletions(-)
-> 
-> diff --git a/drivers/phy/mediatek/phy-mtk-hdmi.c b/drivers/phy/mediatek/phy-mtk-hdmi.c
-> index c5c61f5a9ea0..5184054783c7 100644
-> --- a/drivers/phy/mediatek/phy-mtk-hdmi.c
-> +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c
-> @@ -84,8 +84,9 @@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)
->  	    hdmi_phy->conf->hdmi_phy_disable_tmds)
->  		return &mtk_hdmi_phy_dev_ops;
->  
-> -	dev_err(hdmi_phy->dev, "Failed to get dev ops of phy\n");
-> -		return NULL;
-> +	if (hdmi_phy)
-> +		dev_err(hdmi_phy->dev, "Failed to get dev ops of phy\n");
-> +			return NULL;
-indentation: one tab before return
-
-Thanks
-
->  }
->  
->  static void mtk_hdmi_phy_clk_get_data(struct mtk_hdmi_phy *hdmi_phy,
\ No newline at end of file
+T24gTW9uLCAyMDIwLTEyLTA3IGF0IDE1OjA5ICswMDAwLCBDb2xpbiBLaW5nIHdyb3RlOg0KPiBG
+cm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29tPg0KPiANCj4gQ3Vy
+cmVudGx5IHRoZXJlIGlzIGEgbnVsbCBwb2ludGVyIGNoZWNrIGZvciBoZG1pX3BoeSB0aGF0IGlt
+cGxpZXMgaXQNCj4gbWF5IGJlIG51bGwsIGhvd2V2ZXIgYSBkZXZfZXJyIG1lc3NhZ2VzIGRlcmVm
+ZXJlbmNlcyB0aGlzIHBvdGVudGlhbCBudWxsDQo+IHBvaW50ZXIuICBBdm9pZCBhIG51bGwgcG9p
+bnRlciBkZXJlZmVyZW5jZSBieSBvbmx5IGVtaXR0aW5nIHRoZSBkZXZfZXJyDQo+IG1lc3NhZ2Ug
+aWYgaGRtaV9waHkgaXMgbm9uLW51bGwuICBJdCBpcyBhIG1vb3QgcG9pbnQgaWYgdGhlIGVycm9y
+IG1lc3NhZ2UNCj4gbmVlZHMgdG8gYmUgcHJpbnRlZCBhdCBhbGwsIGJ1dCBzaW5jZSB0aGlzIGlz
+IGEgcmVsYXRpdmVseSBuZXcgcGllY2Ugb2YNCj4gY29kZSBpdCBtYXkgYmUgdXNlZnVsIHRvIGtl
+ZXAgdGhlIG1lc3NhZ2UgaW4gZm9yIHRoZSBtb21lbnQgaW4gY2FzZSB0aGVyZQ0KPiBhcmUgdW5m
+b3JzZWVuIGVycm9ycyB0aGF0IG5lZWQgdG8gYmUgcmVwb3J0ZWQuDQo+IA0KPiBBZGRyZXNzZXMt
+Q292ZXJpdHk6ICgiRGVyZWZlcmVuY2UgYWZ0ZXIgbnVsbCBjaGVjayIpDQo+IEZpeGVzOiBiZTI4
+YjY1MDdjNDYgKCJkcm0vbWVkaWF0ZWs6IHNlcGFyYXRlIGhkbWkgcGh5IHRvIGRpZmZlcmVudCBm
+aWxlIikNCj4gU2lnbmVkLW9mZi1ieTogQ29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25p
+Y2FsLmNvbT4NCj4gLS0tDQo+ICBkcml2ZXJzL3BoeS9tZWRpYXRlay9waHktbXRrLWhkbWkuYyB8
+IDUgKysrLS0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z
+KC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9waHkvbWVkaWF0ZWsvcGh5LW10ay1oZG1p
+LmMgYi9kcml2ZXJzL3BoeS9tZWRpYXRlay9waHktbXRrLWhkbWkuYw0KPiBpbmRleCBjNWM2MWY1
+YTllYTAuLjUxODQwNTQ3ODNjNyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9waHkvbWVkaWF0ZWsv
+cGh5LW10ay1oZG1pLmMNCj4gKysrIGIvZHJpdmVycy9waHkvbWVkaWF0ZWsvcGh5LW10ay1oZG1p
+LmMNCj4gQEAgLTg0LDggKzg0LDkgQEAgbXRrX2hkbWlfcGh5X2Rldl9nZXRfb3BzKGNvbnN0IHN0
+cnVjdCBtdGtfaGRtaV9waHkgKmhkbWlfcGh5KQ0KPiAgCSAgICBoZG1pX3BoeS0+Y29uZi0+aGRt
+aV9waHlfZGlzYWJsZV90bWRzKQ0KPiAgCQlyZXR1cm4gJm10a19oZG1pX3BoeV9kZXZfb3BzOw0K
+PiAgDQo+IC0JZGV2X2VycihoZG1pX3BoeS0+ZGV2LCAiRmFpbGVkIHRvIGdldCBkZXYgb3BzIG9m
+IHBoeVxuIik7DQo+IC0JCXJldHVybiBOVUxMOw0KPiArCWlmIChoZG1pX3BoeSkNCj4gKwkJZGV2
+X2VycihoZG1pX3BoeS0+ZGV2LCAiRmFpbGVkIHRvIGdldCBkZXYgb3BzIG9mIHBoeVxuIik7DQo+
+ICsJCQlyZXR1cm4gTlVMTDsNCmluZGVudGF0aW9uOiBvbmUgdGFiIGJlZm9yZSByZXR1cm4NCg0K
+VGhhbmtzDQoNCj4gIH0NCj4gIA0KPiAgc3RhdGljIHZvaWQgbXRrX2hkbWlfcGh5X2Nsa19nZXRf
+ZGF0YShzdHJ1Y3QgbXRrX2hkbWlfcGh5ICpoZG1pX3BoeSwNCg0K
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 24159e9..0d96c9e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,24 +8,22 @@
   "Subject\0Re: [PATCH][next] drm/mediatek: avoid dereferencing a null hdmi_phy on an error message\0"
 ]
 [
-  "Date\0Tue, 8 Dec 2020 09:50:02 +0800\0"
+  "Date\0Tue, 08 Dec 2020 01:50:02 +0000\0"
 ]
 [
   "To\0Colin King <colin.king\@canonical.com>\0"
 ]
 [
   "Cc\0Chun-Kuang Hu <chunkuang.hu\@kernel.org>",
-  " Philipp Zabel <p.zabel\@pengutronix.de>",
+  " chunhui dai <chunhui.dai\@mediatek.com>",
+  " kernel-janitors\@vger.kernel.org",
+  " linux-kernel\@vger.kernel.org",
+  " dri-devel\@lists.freedesktop.org",
   " Kishon Vijay Abraham I <kishon\@ti.com>",
   " Vinod Koul <vkoul\@kernel.org>",
+  " linux-mediatek\@lists.infradead.org",
   " Matthias Brugger <matthias.bgg\@gmail.com>",
-  " CK Hu <ck.hu\@mediatek.com>",
-  " chunhui dai <chunhui.dai\@mediatek.com>",
-  " <dri-devel\@lists.freedesktop.org>",
-  " <linux-arm-kernel\@lists.infradead.org>",
-  " <linux-mediatek\@lists.infradead.org>",
-  " <kernel-janitors\@vger.kernel.org>",
-  " <linux-kernel\@vger.kernel.org>\0"
+  " linux-arm-kernel\@lists.infradead.org\0"
 ]
 [
   "\0000:1\0"
@@ -34,44 +32,35 @@
   "b\0"
 ]
 [
-  "On Mon, 2020-12-07 at 15:09 +0000, Colin King wrote:\n",
-  "> From: Colin Ian King <colin.king\@canonical.com>\n",
-  "> \n",
-  "> Currently there is a null pointer check for hdmi_phy that implies it\n",
-  "> may be null, however a dev_err messages dereferences this potential null\n",
-  "> pointer.  Avoid a null pointer dereference by only emitting the dev_err\n",
-  "> message if hdmi_phy is non-null.  It is a moot point if the error message\n",
-  "> needs to be printed at all, but since this is a relatively new piece of\n",
-  "> code it may be useful to keep the message in for the moment in case there\n",
-  "> are unforseen errors that need to be reported.\n",
-  "> \n",
-  "> Addresses-Coverity: (\"Dereference after null check\")\n",
-  "> Fixes: be28b6507c46 (\"drm/mediatek: separate hdmi phy to different file\")\n",
-  "> Signed-off-by: Colin Ian King <colin.king\@canonical.com>\n",
-  "> ---\n",
-  ">  drivers/phy/mediatek/phy-mtk-hdmi.c | 5 +++--\n",
-  ">  1 file changed, 3 insertions(+), 2 deletions(-)\n",
-  "> \n",
-  "> diff --git a/drivers/phy/mediatek/phy-mtk-hdmi.c b/drivers/phy/mediatek/phy-mtk-hdmi.c\n",
-  "> index c5c61f5a9ea0..5184054783c7 100644\n",
-  "> --- a/drivers/phy/mediatek/phy-mtk-hdmi.c\n",
-  "> +++ b/drivers/phy/mediatek/phy-mtk-hdmi.c\n",
-  "> \@\@ -84,8 +84,9 \@\@ mtk_hdmi_phy_dev_get_ops(const struct mtk_hdmi_phy *hdmi_phy)\n",
-  ">  \t    hdmi_phy->conf->hdmi_phy_disable_tmds)\n",
-  ">  \t\treturn &mtk_hdmi_phy_dev_ops;\n",
-  ">  \n",
-  "> -\tdev_err(hdmi_phy->dev, \"Failed to get dev ops of phy\\n\");\n",
-  "> -\t\treturn NULL;\n",
-  "> +\tif (hdmi_phy)\n",
-  "> +\t\tdev_err(hdmi_phy->dev, \"Failed to get dev ops of phy\\n\");\n",
-  "> +\t\t\treturn NULL;\n",
-  "indentation: one tab before return\n",
-  "\n",
-  "Thanks\n",
-  "\n",
-  ">  }\n",
-  ">  \n",
-  ">  static void mtk_hdmi_phy_clk_get_data(struct mtk_hdmi_phy *hdmi_phy,"
+  "T24gTW9uLCAyMDIwLTEyLTA3IGF0IDE1OjA5ICswMDAwLCBDb2xpbiBLaW5nIHdyb3RlOg0KPiBG\n",
+  "cm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmljYWwuY29tPg0KPiANCj4gQ3Vy\n",
+  "cmVudGx5IHRoZXJlIGlzIGEgbnVsbCBwb2ludGVyIGNoZWNrIGZvciBoZG1pX3BoeSB0aGF0IGlt\n",
+  "cGxpZXMgaXQNCj4gbWF5IGJlIG51bGwsIGhvd2V2ZXIgYSBkZXZfZXJyIG1lc3NhZ2VzIGRlcmVm\n",
+  "ZXJlbmNlcyB0aGlzIHBvdGVudGlhbCBudWxsDQo+IHBvaW50ZXIuICBBdm9pZCBhIG51bGwgcG9p\n",
+  "bnRlciBkZXJlZmVyZW5jZSBieSBvbmx5IGVtaXR0aW5nIHRoZSBkZXZfZXJyDQo+IG1lc3NhZ2Ug\n",
+  "aWYgaGRtaV9waHkgaXMgbm9uLW51bGwuICBJdCBpcyBhIG1vb3QgcG9pbnQgaWYgdGhlIGVycm9y\n",
+  "IG1lc3NhZ2UNCj4gbmVlZHMgdG8gYmUgcHJpbnRlZCBhdCBhbGwsIGJ1dCBzaW5jZSB0aGlzIGlz\n",
+  "IGEgcmVsYXRpdmVseSBuZXcgcGllY2Ugb2YNCj4gY29kZSBpdCBtYXkgYmUgdXNlZnVsIHRvIGtl\n",
+  "ZXAgdGhlIG1lc3NhZ2UgaW4gZm9yIHRoZSBtb21lbnQgaW4gY2FzZSB0aGVyZQ0KPiBhcmUgdW5m\n",
+  "b3JzZWVuIGVycm9ycyB0aGF0IG5lZWQgdG8gYmUgcmVwb3J0ZWQuDQo+IA0KPiBBZGRyZXNzZXMt\n",
+  "Q292ZXJpdHk6ICgiRGVyZWZlcmVuY2UgYWZ0ZXIgbnVsbCBjaGVjayIpDQo+IEZpeGVzOiBiZTI4\n",
+  "YjY1MDdjNDYgKCJkcm0vbWVkaWF0ZWs6IHNlcGFyYXRlIGhkbWkgcGh5IHRvIGRpZmZlcmVudCBm\n",
+  "aWxlIikNCj4gU2lnbmVkLW9mZi1ieTogQ29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25p\n",
+  "Y2FsLmNvbT4NCj4gLS0tDQo+ICBkcml2ZXJzL3BoeS9tZWRpYXRlay9waHktbXRrLWhkbWkuYyB8\n",
+  "IDUgKysrLS0NCj4gIDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25z\n",
+  "KC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9waHkvbWVkaWF0ZWsvcGh5LW10ay1oZG1p\n",
+  "LmMgYi9kcml2ZXJzL3BoeS9tZWRpYXRlay9waHktbXRrLWhkbWkuYw0KPiBpbmRleCBjNWM2MWY1\n",
+  "YTllYTAuLjUxODQwNTQ3ODNjNyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9waHkvbWVkaWF0ZWsv\n",
+  "cGh5LW10ay1oZG1pLmMNCj4gKysrIGIvZHJpdmVycy9waHkvbWVkaWF0ZWsvcGh5LW10ay1oZG1p\n",
+  "LmMNCj4gQEAgLTg0LDggKzg0LDkgQEAgbXRrX2hkbWlfcGh5X2Rldl9nZXRfb3BzKGNvbnN0IHN0\n",
+  "cnVjdCBtdGtfaGRtaV9waHkgKmhkbWlfcGh5KQ0KPiAgCSAgICBoZG1pX3BoeS0+Y29uZi0+aGRt\n",
+  "aV9waHlfZGlzYWJsZV90bWRzKQ0KPiAgCQlyZXR1cm4gJm10a19oZG1pX3BoeV9kZXZfb3BzOw0K\n",
+  "PiAgDQo+IC0JZGV2X2VycihoZG1pX3BoeS0+ZGV2LCAiRmFpbGVkIHRvIGdldCBkZXYgb3BzIG9m\n",
+  "IHBoeVxuIik7DQo+IC0JCXJldHVybiBOVUxMOw0KPiArCWlmIChoZG1pX3BoeSkNCj4gKwkJZGV2\n",
+  "X2VycihoZG1pX3BoeS0+ZGV2LCAiRmFpbGVkIHRvIGdldCBkZXYgb3BzIG9mIHBoeVxuIik7DQo+\n",
+  "ICsJCQlyZXR1cm4gTlVMTDsNCmluZGVudGF0aW9uOiBvbmUgdGFiIGJlZm9yZSByZXR1cm4NCg0K\n",
+  "VGhhbmtzDQoNCj4gIH0NCj4gIA0KPiAgc3RhdGljIHZvaWQgbXRrX2hkbWlfcGh5X2Nsa19nZXRf\n",
+  "ZGF0YShzdHJ1Y3QgbXRrX2hkbWlfcGh5ICpoZG1pX3BoeSwNCg0K"
 ]
 
-ba621ada24dee8e5f6d2b1e4a17d9af0cee20e788b60638e692ad7165c7e6b81
+51304486d2da7a166d90813e058741a2554bf6d2d63d8149b0949fece9090d10
