Hi Joerg,

On 2022/3/4 17:37, Joerg Roedel wrote:
Hi Baolu,

On Tue, Mar 01, 2022 at 10:01:47AM +0800, Lu Baolu wrote:
This includes patches queued for v5.18. It includes:

  - [PATCH 1 ~ 11] Various cleanups, no intentional functional changes.
  - [PATCH 12] Enable ATS in SoC-integrated devices listed in ACPI/SATC
               table.

Please consider them for v5.18.

I would, but this shows non-trivial conflicts when I am applying it to
the x86/vt-d branch. Can you please re-base the changes and send again?

It's based on this series:

https://lore.kernel.org/linux-iommu/yhy%[email protected]/

which contains some cleanup in vt-d driver as well.

If I re-base the series onto the vt-d branch, there will also be
conflicts when you merge the core and vt-d branch.

I can re-base anyway if you think that's not a problem.

Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to