diff for duplicates of <20210430185816.00000ef5@Huawei.com>

diff --git a/a/1.txt b/N1/1.txt
index c9e500c..691e232 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -41,9 +41,3 @@ maybe err_unlocked; to indicate the lock isn't held.  This briefly confused me.
 >  	spin_lock_irq(&dcmi->irqlock);
 >  	/*
 >  	 * Return all buffers to vb2 in QUEUED state.
-
-
-_______________________________________________
-linux-arm-kernel mailing list
-linux-arm-kernel@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 4c2d13a..b5c9722 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -58,12 +58,6 @@
  "> +err_unlock:\n"
  ">  \tspin_lock_irq(&dcmi->irqlock);\n"
  ">  \t/*\n"
- ">  \t * Return all buffers to vb2 in QUEUED state.\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "linux-arm-kernel mailing list\n"
- "linux-arm-kernel@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+ ">  \t * Return all buffers to vb2 in QUEUED state."
 
-981578ee6a25138a8bfc6193e0123ab847afc62c56f95cb11b7acefa724d7c72
+5c4f6ac8ba79cabc1d5515e5dfe701668df1249524b9021f63075fc3ae091fdb
