On Mon, Jun 8, 2020 at 8:35 AM Vasily Gorbik <[email protected]> wrote: > > Please note 2 minor merge conflict resolutions below:
There was a third because of the iommu tree I merged today.
That one looked trivial too, but please double-check things anyway,
Linus
