All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20220511141328.GA31939@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index c495f7b..e9c45b5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,3 @@ http://git.infradead.org/users/hch/dma-mapping.git/commitdiff/62cb1ca1654b57589c
 
 There were a few smaller merge conflicts with the swiotlb refactoring.
 I think everything is fine, but please take another look if possible.
-_______________________________________________
-iommu mailing list
-iommu@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/iommu
diff --git a/a/content_digest b/N1/content_digest
index e4a69cb..5a90709 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -10,13 +10,13 @@
  "Subject\0Re: [PATCH] swiotlb-xen: fix DMA_ATTR_NO_KERNEL_MAPPING on arm\0"
  "Date\0Wed, 11 May 2022 16:13:28 +0200\0"
  "To\0Stefano Stabellini <sstabellini@kernel.org>\0"
- "Cc\0jgross@suse.com"
-  iommu@lists.linux-foundation.org
-  xen-devel@lists.xenproject.org
-  Boris Ostrovsky <boris.ostrovsky@oracle.com>
-  Rahul Singh <Rahul.Singh@arm.com>
+ "Cc\0Boris Ostrovsky <boris.ostrovsky@oracle.com>"
   Christoph Hellwig <hch@lst.de>
- " linux-arm-kernel@lists.infradead.org\0"
+  jgross@suse.com
+  xen-devel@lists.xenproject.org
+  linux-arm-kernel@lists.infradead.org
+  iommu@lists.linux-foundation.org
+ " Rahul Singh <Rahul.Singh@arm.com>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 29, 2022 at 04:15:38PM -0700, Stefano Stabellini wrote:\n"
@@ -28,10 +28,6 @@
  "http://git.infradead.org/users/hch/dma-mapping.git/commitdiff/62cb1ca1654b57589c582efae2748159c74ee356\n"
  "\n"
  "There were a few smaller merge conflicts with the swiotlb refactoring.\n"
- "I think everything is fine, but please take another look if possible.\n"
- "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ I think everything is fine, but please take another look if possible.
 
-f68505531d09e10a751854503affa13d1eaac1f474b3a340ccf121ac0cdd7512
+4c26cde7b5554cb6a3a25577bbcad1c2bceb434062a94b7d5e5e986b6664cc20

diff --git a/a/1.txt b/N2/1.txt
index c495f7b..579333b 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -8,7 +8,8 @@ http://git.infradead.org/users/hch/dma-mapping.git/commitdiff/62cb1ca1654b57589c
 
 There were a few smaller merge conflicts with the swiotlb refactoring.
 I think everything is fine, but please take another look if possible.
+
 _______________________________________________
-iommu mailing list
-iommu@lists.linux-foundation.org
-https://lists.linuxfoundation.org/mailman/listinfo/iommu
+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/N2/content_digest
index e4a69cb..7f2c973 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -10,13 +10,13 @@
  "Subject\0Re: [PATCH] swiotlb-xen: fix DMA_ATTR_NO_KERNEL_MAPPING on arm\0"
  "Date\0Wed, 11 May 2022 16:13:28 +0200\0"
  "To\0Stefano Stabellini <sstabellini@kernel.org>\0"
- "Cc\0jgross@suse.com"
-  iommu@lists.linux-foundation.org
-  xen-devel@lists.xenproject.org
-  Boris Ostrovsky <boris.ostrovsky@oracle.com>
-  Rahul Singh <Rahul.Singh@arm.com>
+ "Cc\0Boris Ostrovsky <boris.ostrovsky@oracle.com>"
   Christoph Hellwig <hch@lst.de>
- " linux-arm-kernel@lists.infradead.org\0"
+  jgross@suse.com
+  xen-devel@lists.xenproject.org
+  linux-arm-kernel@lists.infradead.org
+  iommu@lists.linux-foundation.org
+ " Rahul Singh <Rahul.Singh@arm.com>\0"
  "\00:1\0"
  "b\0"
  "On Fri, Apr 29, 2022 at 04:15:38PM -0700, Stefano Stabellini wrote:\n"
@@ -29,9 +29,10 @@
  "\n"
  "There were a few smaller merge conflicts with the swiotlb refactoring.\n"
  "I think everything is fine, but please take another look if possible.\n"
+ "\n"
  "_______________________________________________\n"
- "iommu mailing list\n"
- "iommu@lists.linux-foundation.org\n"
- https://lists.linuxfoundation.org/mailman/listinfo/iommu
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-f68505531d09e10a751854503affa13d1eaac1f474b3a340ccf121ac0cdd7512
+04f5920d8bc2555e62823112fcd2b26843f23ed1b623fdb9412350c1488f1572

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.