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

[Alex Williamson]

On Mon, 20 May 2024 15:05:26 -0700
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

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