diff for duplicates of <1454106914-15857-3-git-send-email-okaya@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 8e3026d..c0407e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,7 +73,7 @@ index 0000000..e3677a5 + +Hypervisor OS configuration: + -+ hidma-mgmt@f9984000 = { ++ hidma-mgmt at f9984000 = { + compatible = "qcom,hidma-mgmt-1.0"; + reg = <0xf9984000 0x15000>; + dma-channels = <6>; @@ -83,7 +83,7 @@ index 0000000..e3677a5 + max-read-transactions = <31>; + channel-reset-timeout-cycles = <0x500>; + -+ hidma_24: dma-controller@0x5c050000 { ++ hidma_24: dma-controller at 0x5c050000 { + compatible = "qcom,hidma-1.0"; + reg = <0 0x5c050000 0x0 0x1000>, + <0 0x5c0b0000 0x0 0x1000>; @@ -96,7 +96,7 @@ index 0000000..e3677a5 + +Guest OS configuration: + -+ hidma_24: dma-controller@0x5c050000 { ++ hidma_24: dma-controller at 0x5c050000 { + compatible = "qcom,hidma-1.0"; + reg = <0 0x5c050000 0x0 0x1000>, + <0 0x5c0b0000 0x0 0x1000>; diff --git a/a/content_digest b/N1/content_digest index 2221a5d..a530ee3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,8 @@ "ref\01454106914-15857-1-git-send-email-okaya@codeaurora.org\0" - "From\0Sinan Kaya <okaya@codeaurora.org>\0" + "From\0okaya@codeaurora.org (Sinan Kaya)\0" "Subject\0[PATCH V13 02/10] dma: hidma: Add Device Tree binding\0" "Date\0Fri, 29 Jan 2016 17:35:05 -0500\0" - "To\0dmaengine@vger.kernel.org" - marc.zyngier@arm.com - mark.rutland@arm.com - timur@codeaurora.org - devicetree@vger.kernel.org - cov@codeaurora.org - vinod.koul@intel.com - " jcm@redhat.com\0" - "Cc\0vikrams@codeaurora.org" - arnd@arndb.de - eric.auger@linaro.org - linux-arm-msm@vger.kernel.org - linux-kernel@vger.kernel.org - Sinan Kaya <okaya@codeaurora.org> - linux-arm-kernel@lists.infradead.org - agross@codeaurora.org - " shankerd@codeaurora.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Add documentation for the Qualcomm Technologies HIDMA binding.\n" @@ -96,7 +80,7 @@ "+\n" "+Hypervisor OS configuration:\n" "+\n" - "+\thidma-mgmt@f9984000 = {\n" + "+\thidma-mgmt at f9984000 = {\n" "+\t\tcompatible = \"qcom,hidma-mgmt-1.0\";\n" "+\t\treg = <0xf9984000 0x15000>;\n" "+\t\tdma-channels = <6>;\n" @@ -106,7 +90,7 @@ "+\t\tmax-read-transactions = <31>;\n" "+\t\tchannel-reset-timeout-cycles = <0x500>;\n" "+\n" - "+\t\thidma_24: dma-controller@0x5c050000 {\n" + "+\t\thidma_24: dma-controller at 0x5c050000 {\n" "+\t\t\tcompatible = \"qcom,hidma-1.0\";\n" "+\t\t\treg = <0 0x5c050000 0x0 0x1000>,\n" "+\t\t\t <0 0x5c0b0000 0x0 0x1000>;\n" @@ -119,7 +103,7 @@ "+\n" "+Guest OS configuration:\n" "+\n" - "+\thidma_24: dma-controller@0x5c050000 {\n" + "+\thidma_24: dma-controller at 0x5c050000 {\n" "+\t\tcompatible = \"qcom,hidma-1.0\";\n" "+\t\treg = <0 0x5c050000 0x0 0x1000>,\n" "+\t\t <0 0x5c0b0000 0x0 0x1000>;\n" @@ -131,4 +115,4 @@ "-- \n" 1.8.2.1 -101e4b0ef7f59f84b3bc6ed90b19dd9a7ffec7ba25d3cf349afe52f4d932cd6f +15ee8d0828ed827e5cb06859b7168bc776ae9d340556fc998691552f42de8838
diff --git a/a/content_digest b/N2/content_digest index 2221a5d..eb050ac 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -10,15 +10,15 @@ cov@codeaurora.org vinod.koul@intel.com " jcm@redhat.com\0" - "Cc\0vikrams@codeaurora.org" - arnd@arndb.de + "Cc\0shankerd@codeaurora.org" + vikrams@codeaurora.org eric.auger@linaro.org + agross@codeaurora.org + arnd@arndb.de linux-arm-msm@vger.kernel.org - linux-kernel@vger.kernel.org - Sinan Kaya <okaya@codeaurora.org> linux-arm-kernel@lists.infradead.org - agross@codeaurora.org - " shankerd@codeaurora.org\0" + Sinan Kaya <okaya@codeaurora.org> + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add documentation for the Qualcomm Technologies HIDMA binding.\n" @@ -131,4 +131,4 @@ "-- \n" 1.8.2.1 -101e4b0ef7f59f84b3bc6ed90b19dd9a7ffec7ba25d3cf349afe52f4d932cd6f +9f35c5dd699d8233714843c6a6730fad6f51be36ddbd1d836588031e9f6fc751
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.