+ Stephen Rothwell On Tue, 6 Dec 2022 at 17:59, Thierry Reding <thierry.reding@xxxxxxxxx> wrote: > > From: Thierry Reding <treding@xxxxxxxxxx> > > Hi, > > This is an updated version of v12 from a few days ago: > > https://lore.kernel.org/all/20221202152644.29450-1-thierry.reding@xxxxxxxxx/ > > The only difference here is a fix for the included headers (bitops.h > does not have all the definitions on all architectures, so we need > bitfield.h instead) and an Acked-by from Robin on the new Tegra-specific > helper. > > It'd be great to see this go in for v6.2 so that the new helper is > available for the next release and the other patches that I have > prepared can be merged. > > Ulf, given that Joerg has acked patch 1 and Robin has acked patch 2, I > think the expectation is for you to pick up the whole set. Applied for next, thanks! Note that, it seems likely that we may encounter a merge conflict between the mmc and iommu tree, due to changes in include/linux/iommu.h. Although, if that's the case, I believe the conflict should be trivial to resolve, so let's try this and see how it goes. Stephen, I added you here, just to let you know of what goes on. > > Thanks, > Thierry > > Prathamesh Shete (3): > mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data > mmc: sdhci-tegra: Add support to program MC stream ID > mmc: sdhci-tegra: Issue CMD and DAT resets together > > Thierry Reding (3): > iommu: Add note about struct iommu_fwspec usage > iommu/tegra: Add tegra_dev_iommu_get_stream_id() helper > mmc: sdhci-tegra: Sort includes alphabetically > > drivers/mmc/host/sdhci-tegra.c | 69 ++++++++++++++++++++++++++++------ > drivers/mmc/host/sdhci.c | 5 +++ > drivers/mmc/host/sdhci.h | 2 + > include/linux/iommu.h | 25 ++++++++++++ > 4 files changed, 89 insertions(+), 12 deletions(-) Kind regards Uffe
