All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20140624091808.GC26013@arm.com>

diff --git a/a/1.txt b/N1/1.txt
index cd414ca..c2e8201 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -10,19 +10,19 @@ On Sat, Jun 21, 2014 at 12:16:25AM +0100, Olav Haugan wrote:
 > > I don't understand the problem. If you have stream IDs 0 through 7,
 > > you would have
 > > 
-> > 	master@a {
+> > 	master at a {
 > > 		...
 > > 		iommus = <&smmu 0>;
 > > 	};
 > > 
-> > 	master@b {
+> > 	master at b {
 > > 		...
 > > 		iommus = <&smmu 1;
 > > 	};
 > > 
 > > 	...
 > > 
-> > 	master@12 {
+> > 	master at 12 {
 > > 		...
 > > 		iommus = <&smmu 7;
 > > 	};
@@ -41,7 +41,7 @@ On Sat, Jun 21, 2014 at 12:16:25AM +0100, Olav Haugan wrote:
 > 		#size-cells = <0>;
 > 	};
 > 
-> 	master@a {
+> 	master at a {
 > 		...
 > 		iommus = <&iommu StreamID0 MASK0>,
 > 			 <&iommu StreamID1 MASK1>,
diff --git a/a/content_digest b/N1/content_digest
index 9008ea4..1e53d45 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,30 +2,10 @@
  "ref\0CAL_JsqKumG1PSFoVfeGpLLG+MjXFeF4aUjun=vv1BJpaxk0Byg@mail.gmail.com\0"
  "ref\04545972.cM7IP1qTXQ@wuerfel\0"
  "ref\053A4C0C9.2050908@codeaurora.org\0"
- "From\0Will Deacon <will.deacon@arm.com>\0"
- "Subject\0Re: [PATCH v2] devicetree: Add generic IOMMU device tree bindings\0"
+ "From\0will.deacon@arm.com (Will Deacon)\0"
+ "Subject\0[PATCH v2] devicetree: Add generic IOMMU device tree bindings\0"
  "Date\0Tue, 24 Jun 2014 10:18:08 +0100\0"
- "To\0Olav Haugan <ohaugan@codeaurora.org>\0"
- "Cc\0Arnd Bergmann <arnd@arndb.de>"
-  Rob Herring <robherring2@gmail.com>
-  Mark Rutland <Mark.Rutland@arm.com>
-  devicetree@vger.kernel.org <devicetree@vger.kernel.org>
-  linux-samsung-soc@vger.kernel.org <linux-samsung-soc@vger.kernel.org>
-  Pawel Moll <Pawel.Moll@arm.com>
-  Ian Campbell <ijc+devicetree@hellion.org.uk>
-  Grant Grundler <grundler@chromium.org>
-  Joerg Roedel <joro@8bytes.org>
-  Stephen Warren <swarren@wwwdotorg.org>
-  linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>
-  Marc Zyngier <Marc.Zyngier@arm.com>
-  Linux IOMMU <iommu@lists.linux-foundation.org>
-  Rob Herring <robh+dt@kernel.org>
-  Thierry Reding <thierry.reding@gmail.com>
-  Kumar Gala <galak@codeaurora.org>
-  linux-tegra@vger.kernel.org <linux-tegra@vger.kernel.org>
-  Cho KyongHo <pullip.cho@samsung.com>
-  Dave P Martin <Dave.Martin@arm.com>
- " linux-arm-kernel@lists.infradead.org <linux-arm->\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Sat, Jun 21, 2014 at 12:16:25AM +0100, Olav Haugan wrote:\n"
@@ -40,19 +20,19 @@
  "> > I don't understand the problem. If you have stream IDs 0 through 7,\n"
  "> > you would have\n"
  "> > \n"
- "> > \tmaster@a {\n"
+ "> > \tmaster at a {\n"
  "> > \t\t...\n"
  "> > \t\tiommus = <&smmu 0>;\n"
  "> > \t};\n"
  "> > \n"
- "> > \tmaster@b {\n"
+ "> > \tmaster at b {\n"
  "> > \t\t...\n"
  "> > \t\tiommus = <&smmu 1;\n"
  "> > \t};\n"
  "> > \n"
  "> > \t...\n"
  "> > \n"
- "> > \tmaster@12 {\n"
+ "> > \tmaster at 12 {\n"
  "> > \t\t...\n"
  "> > \t\tiommus = <&smmu 7;\n"
  "> > \t};\n"
@@ -71,7 +51,7 @@
  "> \t\t#size-cells = <0>;\n"
  "> \t};\n"
  "> \n"
- "> \tmaster@a {\n"
+ "> \tmaster at a {\n"
  "> \t\t...\n"
  "> \t\tiommus = <&iommu StreamID0 MASK0>,\n"
  "> \t\t\t <&iommu StreamID1 MASK1>,\n"
@@ -83,4 +63,4 @@
  "\n"
  Will
 
-c32091548b8b58bffdc3e5779c1cd5f961c620c9e7366068adf571d2ddeb9a81
+fadf20a8eb69a299c2ae8eefa8f5479c540a15a0d47c7e089bf79bc409a052ca

diff --git a/a/content_digest b/N2/content_digest
index 9008ea4..9c5b14a 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -25,7 +25,8 @@
   linux-tegra@vger.kernel.org <linux-tegra@vger.kernel.org>
   Cho KyongHo <pullip.cho@samsung.com>
   Dave P Martin <Dave.Martin@arm.com>
- " linux-arm-kernel@lists.infradead.org <linux-arm->\0"
+  linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>
+ " Hiroshi Doyu <hdoyu@nvidia.com>\0"
  "\00:1\0"
  "b\0"
  "On Sat, Jun 21, 2014 at 12:16:25AM +0100, Olav Haugan wrote:\n"
@@ -83,4 +84,4 @@
  "\n"
  Will
 
-c32091548b8b58bffdc3e5779c1cd5f961c620c9e7366068adf571d2ddeb9a81
+039fc313738f249dd0ab9edb90f6c1c3b39a9dd3a76389d3d9e3f3c957bde636

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.