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] [day] [month] [year] [list]

Message-ID: <CAHk-=wiG+jR7TJdCX_Xa7_dbQP8wU966e8eimUs48VVG9ac0sw@mail.gmail.com>
Date: Mon, 25 Nov 2024 18:45:00 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Dmitry Safonov <0x7f454c46@...il.com>
Cc: pr-tracker-bot@...nel.org, iommu@...ts.linux.dev, 
	Joerg Roedel <joro@...tes.org>, open list <linux-kernel@...r.kernel.org>, 
	Will Deacon <will@...nel.org>
Subject: Re: [git pull] IOMMU Updates for Linux v6.13

On Mon, 25 Nov 2024 at 17:46, Dmitry Safonov <0x7f454c46@...il.com> wrote:
>
> It seems to have a minor merge resolution artefact: iommu_present() now
> has a header declaration with no definition.

Hmm. Yes. It looks like the merge in commit ae3325f752ef ("Merge
branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core'
into next") is buggy, and the iommu_present() declaration survived
that merge even though the 'core' branch that was merged into it had
removed it.

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.

I'll fix it up and remove the left-over declaration.

           Linus