MIME-Version: 1.0
References: <C8C4DFDA-998F-48AD-93C9-DE16F8080A02@meta.com>
 <CAHk-=wghhViNZCj4ibSr42HjVGdHro_DWW7wCOQ61p2v59cciw@mail.gmail.com> <4BA6A759-F69C-406E-9D29-EDCC9B48F798@meta.com>
In-Reply-To: <4BA6A759-F69C-406E-9D29-EDCC9B48F798@meta.com>
From:   Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri, 3 Mar 2023 09:59:07 -0800
Message-ID: <CAHk-=wjCNtTJ3DrG1266xXPZF=qH=GvpWApkYStJ9knskRnU3w@mail.gmail.com>
Subject: Re: [GIT PULL] zstd changes for v6.3-rc1
To:     Nick Terrell <terrelln@meta.com>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nick Terrell <nickrterrell@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Mar 3, 2023 at 9:54=E2=80=AFAM Nick Terrell <terrelln@meta.com> wro=
te:
>
> I=E2=80=99m sorry, I thought this was standard practice for merging in th=
e mainline branch.

Absolutely NOT.

I have harped on "DO NOT DO BACK MERGES" for closer to two _decades_ by now=
.

When you do zstd development, you should normally have absolutely
*ZERO* reason to merge non-zstd work.

> I=E2=80=99ve been following this article [0], which recommended not rebas=
ing my public
> trees, so I merged in the mainline kernel instead.

Half right.

You should not rebase your public trees.

But you should not merge mainline either.

Exactly what relevance does <N> *thousand* driver updates have to zstd?

There are reasons to merge, but they have to be real, explicit, and
MENTIONED IN THE MERGE.

And no, "update to latest" is simply not a reason.

When close to half the commits are pointless merges that have no
explanation, I will not pull (if I notice).

                 Linus