Hi Samuel, On Mon, Jan 02, 2023 at 07:08:57PM -0600, Samuel Holland wrote: > Samuel Holland (6): > dt-bindings: iommu: sun50i: Add compatible for Allwinner D1 > iommu/sun50i: Track masters attached to the domain > iommu/sun50i: Keep the bypass register up to date > iommu/sun50i: Support variants without an external reset > iommu/sun50i: Add support for the D1 variant > riscv: dts: allwinner: d1: Add the IOMMU node There is a conflict between these patches and changes in the IOMMU core branch. With those merged in there is a compile warning about sun50i_iommu_detach_domain() being unused. Fixing that requires removing of 3-4 functions, which I am not sure is the right solution. I pushed the arm/allwinner branch out to the iommu tree (with the core branch merged in) and exluded it from next for now. Can you please have a look and fix this up in a way that does not break the driver? Once this is fixed I will include the arm/allwinner branch into my next branch again. Thanks, Joerg
