Re: [git pull] IOMMU Updates for Linux v6.13

[Joerg Roedel]

On Mon, Nov 25, 2024 at 06:45:00PM -0800, Linus Torvalds wrote:
> Those octopus merges may look cool, but you should never use an
> octopus merge for anything that has any conflicts, because they are
> hard to get right. Joerg clearly didn't get that one right.

Yeah, sorry, my bad. This time around there were unusually many
conflicts between the topic branches, which also forced me to create
two merge commits to put everything together. In this process I
overlooked that the iommu_present() definition slipped through.

Regards,

	Joerg