Received-SPF: pass (google.com: domain of linux-kernel+bounces-184285-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Mon, 20 May 2024 17:03:09 -0600
From: Alex Williamson <alex.williamson@redhat.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "kvm@vger.kernel.org" <kvm@vger.kernel.org>,
 linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] VFIO updates for v6.10-rc1
Message-ID: <20240520170309.76b60123.alex.williamson@redhat.com>
In-Reply-To: <CAHk-=wiecagwwqGQerx35p+1e2jwjjEbXCphKjPO6Q97DrtYPQ@mail.gmail.com>
References: <20240520121223.5be06e39.alex.williamson@redhat.com>
	<CAHk-=wiecagwwqGQerx35p+1e2jwjjEbXCphKjPO6Q97DrtYPQ@mail.gmail.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Mon, 20 May 2024 15:05:26 -0700
Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Mon, 20 May 2024 at 11:12, Alex Williamson
> <alex.williamson@redhat.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?

Sorry.  In my case I've looked through logs and I've seen bare merges in
the past and I guess I assumed the reasoning here would be more obvious.
Clearly that's wrong.  I'll do better.  Thanks,

Alex