Message ID | 20171127095055.21486-1-thierry.reding@gmail.com |
---|---|
Headers | show |
Series | iommu/tegra: Add IOMMU group support | expand |
On Mon, Nov 27, 2017 at 10:50:53AM +0100, Thierry Reding wrote: > From: Thierry Reding <treding@nvidia.com> > > Hi Joerg, > > Both patches in this series are built-time dependent and therefore it > would be easiest if they went in via the same tree (either the IOMMU > tree, or the Tegra tree with your Acked-by on patch 1). Alternatively, > I could put patch two in a separate branch and provide a stable tag for > you to pull in, in order to resolve the dependency. > > Do you have any preference? > > Thierry > > Thierry Reding (2): > iommu/tegra: Allow devices to be grouped > memory: tegra: Create SMMU display groups I just realized that these are actually in the wrong order. The second patch adds the data fields that the first patch uses. Depending on which merge strategy you prefer I can reorder when applying or resend in the correct order. Thierry
On Mon, 27 Nov 2017 10:53:43 +0100 Thierry Reding <thierry.reding@gmail.com> wrote: > On Mon, Nov 27, 2017 at 10:50:53AM +0100, Thierry Reding wrote: > > From: Thierry Reding <treding@nvidia.com> > > > > Hi Joerg, > > > > Both patches in this series are built-time dependent and therefore it > > would be easiest if they went in via the same tree (either the IOMMU > > tree, or the Tegra tree with your Acked-by on patch 1). Alternatively, > > I could put patch two in a separate branch and provide a stable tag for > > you to pull in, in order to resolve the dependency. > > > > Do you have any preference? > > > > Thierry > > > > Thierry Reding (2): > > iommu/tegra: Allow devices to be grouped > > memory: tegra: Create SMMU display groups > > I just realized that these are actually in the wrong order. The second > patch adds the data fields that the first patch uses. Depending on which > merge strategy you prefer I can reorder when applying or resend in the > correct order. Hi Thierry, Joerg is on paternity leave through the end of the year and I'm handling the IOMMU tree in the interim. Given the low traffic on iommu/tegra-smmu.c, I'm going to suggest we take the merge path through the Tegra tree and I'll Ack the first patch to help that along. Please do the necessary re-order when applying. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Thierry Reding <treding@nvidia.com> Hi Joerg, Both patches in this series are built-time dependent and therefore it would be easiest if they went in via the same tree (either the IOMMU tree, or the Tegra tree with your Acked-by on patch 1). Alternatively, I could put patch two in a separate branch and provide a stable tag for you to pull in, in order to resolve the dependency. Do you have any preference? Thierry Thierry Reding (2): iommu/tegra: Allow devices to be grouped memory: tegra: Create SMMU display groups drivers/iommu/tegra-smmu.c | 124 ++++++++++++++++++++++++++++++++++++++-- drivers/memory/tegra/tegra114.c | 15 +++++ drivers/memory/tegra/tegra124.c | 17 ++++++ drivers/memory/tegra/tegra210.c | 15 +++++ drivers/memory/tegra/tegra30.c | 15 +++++ include/soc/tegra/mc.h | 9 +++ 6 files changed, 191 insertions(+), 4 deletions(-)