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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <Z0WtI9-Xxr1eY7Av@8bytes.org>
Date: Tue, 26 Nov 2024 12:12:35 +0100
From: Joerg Roedel <joro@...tes.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Dmitry Safonov <0x7f454c46@...il.com>, pr-tracker-bot@...nel.org,
	iommu@...ts.linux.dev, open list <linux-kernel@...r.kernel.org>,
	Will Deacon <will@...nel.org>
Subject: Re: [git pull] IOMMU Updates for Linux v6.13

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