On 05/11/2012 03:46 AM, Joerg Roedel wrote: > On Thu, May 10, 2012 at 02:08:33PM -0600, Stephen Warren wrote: >> On 05/10/2012 01:50 AM, Hiroshi DOYU wrote: >>> The necessary info is expected to pass from DT. >>> >>> For more precise resource reservation, there shouldn't be any >>> overlapping of register range between SMMU and MC. SMMU register >>> offset needs to be calculated correctly, based on its register bank. >>> >>> Signed-off-by: Hiroshi DOYU <hdoyu@xxxxxxxxxx> >> >> Acked-by: Stephen Warren <swarren@xxxxxxxxxxxxx> >> >> I expect patch 1 will go through the IOMMU tree, and I'll take patch 2 >> through the Tegra tree. > > Any reason for splitting it up? The patches touch mostly drivers/iommu. > So to avoid conflicts its probably the best to apply them together. Patch 1 is the driver that touches drivers/iommu and related documentation, whereas patch 2 touches the device tree file in arch/arm/boot/dts. Either of the patches would get conflicts if they were merged into the "other" tree. -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
