The pull request you sent on Mon, 31 Dec 2018 17:36:58 +0100:
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
> tags/iommu-updates-v4.21
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8e143b90e4d45cca3dc53760d3cfab988bc74571
Thank you!
--
Deet-doot-d
Hi Linus,
there is a small merge conflict this time in arch/powerpc/kernel/iommu.c
with the tag I send you. I did a test-merge with your latest tree
locally to include my resolution in this email, but for some reason git
shows me a conflict in another file (drivers/iommu/amd_iommu.c) in the
result
2 matches
Mail list logo
