Subject: Upcoming merge conflict between s390 fixes and iommu trees

From: Vasily Gorbik <[email-masked]>
Date: Thu, 19 Oct 2023 17:17:31 +0200

Hi Stephen,
Hi Joerg,

I've just picked up commit
c1ae1c59c8c6 ("s390/pci: fix iommu bitmap allocation")
into the s390 fixes branch to still make it into v6.6 (and eventually
get into stable).

It will get conflicts in arch/s390/pci/pci_dma.c with commit
c76c067e488c ("s390/pci: Use dma-iommu layer")
from iommu tree, which is targeting the v6.7 merge window.

The latter commit removes arch/s390/pci/pci_dma.c, so that's
the way to go for the conflict resolution. Joerg, I believe it's your
decision whether you would like to mention this trivial merge conflict in
your pull request to Linus later.

Thank you.