diff for duplicates of <20131009231003.GM2935@alberich> diff --git a/a/1.txt b/N1/1.txt index f0e5a8f..bf65095 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -59,7 +59,7 @@ It still won't work with the current arm-smmu driver as it strictly uses one SMR group for each StreamID. (But the corresponding SMMU has just 4 SMR groups). -Signed-off-by: Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> +Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com> --- arch/arm/boot/dts/ecx-2000.dts | 2 +- arch/arm/boot/dts/ecx-common.dtsi | 2 +- @@ -72,7 +72,7 @@ index 270f052..3904c2b 100644 --- a/arch/arm/boot/dts/ecx-2000.dts +++ b/arch/arm/boot/dts/ecx-2000.dts @@ -135,7 +135,7 @@ - smmu_sata: smmu@920180000 { + smmu_sata: smmu at 920180000 { compatible = "arm,mmu-400"; reg = <0x00000009 0x20180000 0x10000>; - mmu-masters = <&sata>; @@ -92,7 +92,7 @@ index 50e401e..961dc5b 100644 + #stream-id-cells = <10>; }; - sdhci@ffe0e000 { + sdhci at ffe0e000 { diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 4e8ceab..cd370f7 100644 --- a/drivers/iommu/arm-smmu.c diff --git a/a/content_digest b/N1/content_digest index 39ba5da..4b67bf5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,14 +6,10 @@ "ref\020131008165920.GG21189@mudshark.cambridge.arm.com\0" "ref\052545266.6010400@gmail.com\0" "ref\020131009100917.GB5985@mudshark.cambridge.arm.com\0" - "ref\020131009100917.GB5985-MRww78TxoiP5vMa5CHWGZ34zcgK1vI+I0E9HWUfgJXw@public.gmane.org\0" - "From\0Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\0" - "Subject\0Re: [PATCH 3/5] iommu/arm-smmu: Introduce stream ID masking\0" + "From\0andreas.herrmann@calxeda.com (Andreas Herrmann)\0" + "Subject\0[PATCH 3/5] iommu/arm-smmu: Introduce stream ID masking\0" "Date\0Thu, 10 Oct 2013 01:10:03 +0200\0" - "To\0Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>\0" - "Cc\0iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org <iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>" - Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Oct 09, 2013 at 06:09:17AM -0400, Will Deacon wrote:\n" @@ -77,7 +73,7 @@ "uses one SMR group for each StreamID. (But the corresponding SMMU has\n" "just 4 SMR groups).\n" "\n" - "Signed-off-by: Andreas Herrmann <andreas.herrmann-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\n" + "Signed-off-by: Andreas Herrmann <andreas.herrmann@calxeda.com>\n" "---\n" " arch/arm/boot/dts/ecx-2000.dts | 2 +-\n" " arch/arm/boot/dts/ecx-common.dtsi | 2 +-\n" @@ -90,7 +86,7 @@ "--- a/arch/arm/boot/dts/ecx-2000.dts\n" "+++ b/arch/arm/boot/dts/ecx-2000.dts\n" "@@ -135,7 +135,7 @@\n" - " \t\tsmmu_sata: smmu@920180000 {\n" + " \t\tsmmu_sata: smmu at 920180000 {\n" " \t\t\tcompatible = \"arm,mmu-400\";\n" " \t\t\treg = <0x00000009 0x20180000 0x10000>;\n" "-\t\t\tmmu-masters = <&sata>;\n" @@ -110,7 +106,7 @@ "+\t\t\t#stream-id-cells = <10>;\n" " \t\t};\n" " \n" - " \t\tsdhci@ffe0e000 {\n" + " \t\tsdhci at ffe0e000 {\n" "diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c\n" "index 4e8ceab..cd370f7 100644\n" "--- a/drivers/iommu/arm-smmu.c\n" @@ -140,4 +136,4 @@ "-- \n" 1.7.9.5 -1d89505adaed2d1ab380c3c071bd8ec5d1bca5106ba0bc2ce856dabf0e8435fd +bf4ada5eff40910f1186d81827502a92d61a4ea339c2c405545cba93db8cf2d7
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.