linux-kernel - Re: [GIT PULL] VFIO updates for v6.10-rc1

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: <CAHk-=wiecagwwqGQerx35p+1e2jwjjEbXCphKjPO6Q97DrtYPQ@mail.gmail.com>
Date: Mon, 20 May 2024 15:05:26 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Alex Williamson <alex.williamson@...hat.com>
Cc: "kvm@...r.kernel.org" <kvm@...r.kernel.org>, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] VFIO updates for v6.10-rc1

On Mon, 20 May 2024 at 11:12, Alex Williamson
<alex.williamson@...hat.com> wrote:
>
> I've provided the simplified diffstat from a temporary merge branch to
> avoid the noise of merging QAT dependencies from a branch provided by
> Herbert.

The diffstat looks good, but the merge itself sucks.

This is the totality of the "explanation" in the merge commit: "".

Yup. That's it. Nothing. Nada.

If you cannot explain *why* you merged a branch from some other tree,
youi damn well shouldn't have done the merge in the first place.

Merge commits need explanations just like regular commits do. In fact,
because there isn't some obvious diff attached to them, explanations
are arguably even more needed.

I've pulled this, but dammit, why does this keep happening?

                Linus