From:   Nick Terrell <terrelln@meta.com>
To:     Linus Torvalds <torvalds@linux-foundation.org>
CC:     Nick Terrell <terrelln@meta.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Nick Terrell <nickrterrell@gmail.com>
Subject: Re: [GIT PULL] zstd changes for v6.3-rc1
Thread-Topic: [GIT PULL] zstd changes for v6.3-rc1
Thread-Index: AQHZTZizamXiGRhPv0GWaVIL9zubi67pT/wAgAAHCYCAAAF7gIAAAUYA
Date:   Fri, 3 Mar 2023 18:03:50 +0000
Message-ID: <2B90FACE-74EB-47C8-91FD-62E3F77B95EC@meta.com>
References: <C8C4DFDA-998F-48AD-93C9-DE16F8080A02@meta.com>
 <CAHk-=wghhViNZCj4ibSr42HjVGdHro_DWW7wCOQ61p2v59cciw@mail.gmail.com>
 <4BA6A759-F69C-406E-9D29-EDCC9B48F798@meta.com>
 <CAHk-=wjCNtTJ3DrG1266xXPZF=qH=GvpWApkYStJ9knskRnU3w@mail.gmail.com>
In-Reply-To: <CAHk-=wjCNtTJ3DrG1266xXPZF=qH=GvpWApkYStJ9knskRnU3w@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?utf-8?B?Wlczd0J3NXBCUHBJejQxVThPSVFMaU45bmdvdUd4Ym5Lc21PMFJNUFd0eXlO?=
 =?utf-8?B?RXY1bm91Rkk3RTd3bVMrakNrZlgweGUvdkFUQmhQZllzY3Y2Wmd6N25VYzJo?=
 =?utf-8?B?K0V2WDAwV1czZThxUGdUTjV1dWMrZEFHWW9nMGwwRlF0cmYwZ05vK2hvZnV2?=
 =?utf-8?B?VU5VOWlvcDk4cE55czhQUlZDaCtOODFTQzNqb2VZanNuWnlLdGQ5SWxyalVa?=
 =?utf-8?B?TklXaktmSDk4WHlIQW5LWDhvcjBvMjhUWEtSRlYyNjUyNTNDZkhXbFNOajlo?=
 =?utf-8?B?K1hDYWRuRVNjMGh5dEI0dnZjK3FpVnBoOW5GL2ZCYVhGUlFTYzAzbWZoODkw?=
 =?utf-8?B?MG9HTzFmbm9LN1htajNqNStBZkFvdDYxb08rVmF2elFXb0EyWlRFck5NSWh3?=
 =?utf-8?B?eWw0cVQ0UzlyY1JvbHJCazZpWlRRK1V4ekNOdzBBRUpjbUY1NHVJRk42Sm9E?=
 =?utf-8?B?ZklHUzdSYjZUd0c2cHpidHFlN0YwOTlBVW5sRnZZUlpIaWZLMkJnSUtaTHd3?=
 =?utf-8?B?QjJRQlcvaTJpUk90a0VyVGgxRDNGZElrc3BCSjFHOEFkS3NWYTR3elhrZ2VS?=
 =?utf-8?B?U2NNbUVnakx3TFJPbWcvODljUkd1VnBnNW1FcFRBeW9waElseUM2TE8wdFRs?=
 =?utf-8?B?V3pZbmYwbWY1Q0pmZ0RqeHU5dEVMenhYWmx6YU1YOHcxeDJ2WjFPRWZnbEVI?=
 =?utf-8?B?cC9rZDFOaGVYaUdRYnU5YUNhWlBCWWl2U1RsZkhzd3UwcmRDTGN3VXFkZ3dH?=
 =?utf-8?B?N2NzdzUyV1plSEhBMDM0c2FCSElYS0FyL1VOczlQL3dqdm5rZjEvVW5ibCtp?=
 =?utf-8?B?aGlQQ1dwN1d5ZGl5RzF3b1BrNHhhMEg0NU4wU1hRajBqdkdyb2hUMFM1N1Aw?=
 =?utf-8?B?ZkVibnlYZzJTMENSR0Y1R1Y0MnFxVGtTZVEzT0lPbjhWMXQwMUpmWnZDY3ZJ?=
 =?utf-8?B?TGFwYjU5bXZNdGg3emwrcS9VOGlJQ1ZjKzRwUFYydHQ3bmdwTWFVV1N0Q0Fq?=
 =?utf-8?B?RGVReVdEQlJtbzJaL0l0a0NDWVA0Y3Vqc2NWMit3aU9jVGNNbHMyaHdKQ1Vi?=
 =?utf-8?B?RUVvb3kydy91TkN5NGJqMTJ0YVFDRUNqUENuZW1rbG9lZENmT3hMOEZjRGZD?=
 =?utf-8?B?M1BxbHFiTVdnOG9HOU9rUUFZZWNBdGExdVpScXZOeklGL3FySnh6YTMxTXk4?=
 =?utf-8?B?RWQ2cXNiNlNMQXNzNUJXNmVsa0huMzlWUW5PK2lQeWJDN2lZdk0rNTZROFpB?=
 =?utf-8?B?MjFSK013NTAvdlVwbmRqQVRmaEVtNXg5WmZONmU3bEdGc0JEb3BNRWRKS1BV?=
 =?utf-8?B?WlFwWFkvZ2w0dWVnSlZ5bDZoalRJeGx5a3UvQUlkaE9jWnZPZFduRnRROTJV?=
 =?utf-8?B?aVZmUTJTL3dzYXZlMi9la0ZBMW43N3BZZlpJLzZvWG9RSldjd1ErV2VIbVRS?=
 =?utf-8?B?U3ZmWkloQTRqY1JLem80MzR4UUJlaW5OZnNuL2pJM0F2Sjlxa1RvZFUzLzkw?=
 =?utf-8?B?aWRDVGJhb2dEMjg0WkJTaWpqK0NDODBDYXRvdEQ2cy9ZNHZQdHNpMGNyVDZB?=
 =?utf-8?B?WFVXZ0JZTDllY0ZSNEdKT2llTllwVlY2WXkzaDRlYW9mMHZISEI4d3FSaFU2?=
 =?utf-8?B?YjZ4QjFyY0lSMWwvM0N5Q2RkaDA0dVVXTW15SHQyVUwrbFpaVFFJMHV4S2Nu?=
 =?utf-8?B?K2lBZW42QitDZVNxeDRCcCtoZm82eGt4aUhQbVhWd3gxQnM3NFRnZ2ZnTkZK?=
 =?utf-8?B?NWVvN3dmSkFUejdmM3BTTU9LQXNndXdSczJvTlZ1NzhSU2U1WDRXeHdVbHZH?=
 =?utf-8?B?YmhEaGtnMzQ1ZTNPNTZQcndZOCtsbnhJMFZZZ3RUTlV1bnR4cWlxakZaRHRp?=
 =?utf-8?B?WVlqempEUnlvNFM4dkY3bVY2QmNsZGRDNEt0OG1FNWNZSmFIeHVNOWhuK2U3?=
 =?utf-8?B?MS9qMVk1SUNSdHVVSzNQS25mUjByNzRLTmFyZ1pKQTY2UW1OVGhIdnZRTHNm?=
 =?utf-8?B?MVlFcHRSbnE2RlQ3a3MxVXY3cDEyU1NQZ3B5b2MyemM1eVltS1J6UVRMWTdL?=
 =?utf-8?B?ZlNYNURUa3VDWnA3TGR4N0Y1SUExUXlyL3ZVWUpRczdwUHlzQVMwd1hqbC9x?=
 =?utf-8?B?S0FSSHprOTQrdGcyTDB2ZWM0cXRMbUdrRTJUd2h6cHh5SVFDZ0dFRWd5SitI?=
 =?utf-8?Q?zW/x75bi/4I+yR6sf0v99Qw=3D?=
Content-ID: <F766407492B94243866CA9BFEE52F834@namprd15.prod.outlook.com>
MIME-Version: 1.0
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BY5PR15MB3667.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2d0e7117-0fe8-48bf-5897-08db1c11a49d
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2023 18:03:50.4385
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: lV5QTyH/K7V8SOcRoOb4y5UZedTD8EzEyooFSXJpDxhkCrBZdDgXE+gpfMq4FeDqhfVE1W8IyEiFyuzr8rD3KQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR15MB6249
X-Proofpoint-ORIG-GUID: xbpu9tQIoMdElDexZRxgi9dUtAufp2gk
X-Proofpoint-GUID: xbpu9tQIoMdElDexZRxgi9dUtAufp2gk
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-03-03_03,2023-03-03_01,2023-02-09_01
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Mar 3, 2023, at 9:59 AM, Linus Torvalds <torvalds@linux-foundation.org=
> wrote:
>=20
> >=20
> On Fri, Mar 3, 2023 at 9:54=E2=80=AFAM Nick Terrell <terrelln@meta.com> w=
rote:
>>=20
>> I=E2=80=99m sorry, I thought this was standard practice for merging in t=
he mainline branch.
>=20
> Absolutely NOT.
>=20
> I have harped on "DO NOT DO BACK MERGES" for closer to two _decades_ by n=
ow.
>=20
> When you do zstd development, you should normally have absolutely
> *ZERO* reason to merge non-zstd work.
>=20
>> I=E2=80=99ve been following this article [0], which recommended not reba=
sing my public
>> trees, so I merged in the mainline kernel instead.
>=20
> Half right.
>=20
> You should not rebase your public trees.
>=20
> But you should not merge mainline either.
>=20
> Exactly what relevance does <N> *thousand* driver updates have to zstd?
>=20
> There are reasons to merge, but they have to be real, explicit, and
> MENTIONED IN THE MERGE.
>=20
> And no, "update to latest" is simply not a reason.
>=20
> When close to half the commits are pointless merges that have no
> explanation, I will not pull (if I notice).

Thanks for taking the time to explain, I appreciate it, and will not make t=
he same
mistake again in the future.

What do you prefer I do with my current tree? I guess I can either:
- Leave the merges in and keep a stable tree
- Fix up my tree and clean up the merges, but break the stable tree

Best,
Nick Terrell

>                 Linus