diff for duplicates of <20201210194044.065003856@linutronix.de>

diff --git a/a/1.txt b/N1/1.txt
index 53cae6d..d0efbac 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,4 +26,9 @@ Cc: linux-gpio@vger.kernel.org
 +		if (irq > 0 && irq_has_action(irq)) {
  			char *trigger;
  
- 			if (nmk_chip->edge_rising & BIT(offset))
\ No newline at end of file
+ 			if (nmk_chip->edge_rising & BIT(offset))
+
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+https://lists.freedesktop.org/mailman/listinfo/dri-devel
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 89265dd..3f72db0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,56 +14,51 @@
   "To\0LKML <linux-kernel\@vger.kernel.org>\0"
 ]
 [
-  "Cc\0Peter Zijlstra <peterz\@infradead.org>",
-  " Marc Zyngier <maz\@kernel.org>",
-  " Linus Walleij <linus.walleij\@linaro.org>",
-  " linux-arm-kernel\@lists.infradead.org",
-  " linux-gpio\@vger.kernel.org",
+  "Cc\0Mark Rutland <mark.rutland\@arm.com>",
+  " Karthikeyan Mitran <m.karthikeyan\@mobiveil.co.in>",
+  " Peter Zijlstra <peterz\@infradead.org>",
+  " Catalin Marinas <catalin.marinas\@arm.com>",
+  " dri-devel\@lists.freedesktop.org",
+  " Chris Wilson <chris\@chris-wilson.co.uk>",
   " James E.J. Bottomley <James.Bottomley\@hansenpartnership.com>",
-  " Helge Deller <deller\@gmx.de>",
+  " netdev\@vger.kernel.org",
+  " Will Deacon <will\@kernel.org>",
+  " Michal Simek <michal.simek\@xilinx.com>",
+  " linux-s390\@vger.kernel.org",
   " afzal mohammed <afzal.mohd.ma\@gmail.com>",
-  " linux-parisc\@vger.kernel.org",
+  " Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>",
+  " Dave Jiang <dave.jiang\@intel.com>",
+  " xen-devel\@lists.xenproject.org",
+  " Leon Romanovsky <leon\@kernel.org>",
+  " linux-rdma\@vger.kernel.org",
+  " Marc Zyngier <maz\@kernel.org>",
+  " Helge Deller <deller\@gmx.de>",
   " Russell King <linux\@armlinux.org.uk>",
-  " Mark Rutland <mark.rutland\@arm.com>",
-  " Catalin Marinas <catalin.marinas\@arm.com>",
-  " Will Deacon <will\@kernel.org>",
   " Christian Borntraeger <borntraeger\@de.ibm.com>",
+  " linux-pci\@vger.kernel.org",
+  " Jakub Kicinski <kuba\@kernel.org>",
+  " intel-gfx\@lists.freedesktop.org",
+  " Wambui Karuga <wambui.karugax\@gmail.com>",
+  " Allen Hubbe <allenbh\@gmail.com>",
+  " Juergen Gross <jgross\@suse.com>",
+  " Tvrtko Ursulin <tvrtko.ursulin\@linux.intel.com>",
   " Heiko Carstens <hca\@linux.ibm.com>",
-  " linux-s390\@vger.kernel.org",
-  " Jani Nikula <jani.nikula\@linux.intel.com>",
-  " Joonas Lahtinen <joonas.lahtinen\@linux.intel.com>",
+  " linux-gpio\@vger.kernel.org",
+  " Stefano Stabellini <sstabellini\@kernel.org>",
   " Rodrigo Vivi <rodrigo.vivi\@intel.com>",
+  " Bjorn Helgaas <bhelgaas\@google.com>",
+  " Lee Jones <lee.jones\@linaro.org>",
+  " linux-arm-kernel\@lists.infradead.org",
+  " Boris Ostrovsky <boris.ostrovsky\@oracle.com>",
   " David Airlie <airlied\@linux.ie>",
-  " Daniel Vetter <daniel\@ffwll.ch>",
+  " linux-parisc\@vger.kernel.org",
   " Pankaj Bharadiya <pankaj.laxminarayan.bharadiya\@intel.com>",
-  " Chris Wilson <chris\@chris-wilson.co.uk>",
-  " Wambui Karuga <wambui.karugax\@gmail.com>",
-  " intel-gfx\@lists.freedesktop.org",
-  " dri-devel\@lists.freedesktop.org",
-  " Tvrtko Ursulin <tvrtko.ursulin\@linux.intel.com>",
-  " Lee Jones <lee.jones\@linaro.org>",
-  " Jon Mason <jdmason\@kudzu.us>",
-  " Dave Jiang <dave.jiang\@intel.com>",
-  " Allen Hubbe <allenbh\@gmail.com>",
-  " linux-ntb\@googlegroups.com",
-  " Lorenzo Pieralisi <lorenzo.pieralisi\@arm.com>",
-  " Rob Herring <robh\@kernel.org>",
-  " Bjorn Helgaas <bhelgaas\@google.com>",
-  " Michal Simek <michal.simek\@xilinx.com>",
-  " linux-pci\@vger.kernel.org",
-  " Karthikeyan Mitran <m.karthikeyan\@mobiveil.co.in>",
   " Hou Zhiqiang <Zhiqiang.Hou\@nxp.com>",
   " Tariq Toukan <tariqt\@nvidia.com>",
-  " David S. Miller <davem\@davemloft.net>",
-  " Jakub Kicinski <kuba\@kernel.org>",
-  " netdev\@vger.kernel.org",
-  " linux-rdma\@vger.kernel.org",
+  " Jon Mason <jdmason\@kudzu.us>",
+  " linux-ntb\@googlegroups.com",
   " Saeed Mahameed <saeedm\@nvidia.com>",
-  " Leon Romanovsky <leon\@kernel.org>",
-  " Boris Ostrovsky <boris.ostrovsky\@oracle.com>",
-  " Juergen Gross <jgross\@suse.com>",
-  " Stefano Stabellini <sstabellini\@kernel.org>",
-  " xen-devel\@lists.xenproject.org\0"
+  " David S. Miller <davem\@davemloft.net>\0"
 ]
 [
   "\0000:1\0"
@@ -100,7 +95,12 @@
   "+\t\tif (irq > 0 && irq_has_action(irq)) {\n",
   " \t\t\tchar *trigger;\n",
   " \n",
-  " \t\t\tif (nmk_chip->edge_rising & BIT(offset))"
+  " \t\t\tif (nmk_chip->edge_rising & BIT(offset))\n",
+  "\n",
+  "_______________________________________________\n",
+  "dri-devel mailing list\n",
+  "dri-devel\@lists.freedesktop.org\n",
+  "https://lists.freedesktop.org/mailman/listinfo/dri-devel"
 ]
 
-09b4c57feabe4a5d97b6f3ca008a6e6539616b987a9c7ee11b670651309b0b72
+2d5392c29f9209ae9b90b1bb541e22f54d569f9e65499709062974aca0411d85
