From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CA48E7716D for ; Thu, 5 Dec 2024 12:44:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 757286B007B; Thu, 5 Dec 2024 07:44:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 705B96B0082; Thu, 5 Dec 2024 07:44:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5CDE66B0083; Thu, 5 Dec 2024 07:44:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 396D26B007B for ; Thu, 5 Dec 2024 07:44:05 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BDF10AE281 for ; Thu, 5 Dec 2024 12:44:04 +0000 (UTC) X-FDA: 82860872346.10.F2E9817 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf18.hostedemail.com (Postfix) with ESMTP id 115551C0007 for ; Thu, 5 Dec 2024 12:43:55 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W3ojwcXP; spf=pass (imf18.hostedemail.com: domain of alx@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alx@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733402628; a=rsa-sha256; cv=none; b=UpGDzs+cazhmb327oSU1uFOYi4JseMTYoJgL6MHTGi9OGLS44T/VMDBagmFblJPAoOoW2x NsdTLOxsBQbYm6EzjYlUNMTXhtg1ZmOKuI62nPpBV6z7cdk1yErRW0jqxY25434samFERs /0EHvChTwrWO3dSELErkjNvobegFO00= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=W3ojwcXP; spf=pass (imf18.hostedemail.com: domain of alx@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=alx@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733402628; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=YxoDz7dcbrNjsG+8WVY1C3PS9tAbg2FrZxu7jrHT2yM=; b=tpY3oVT2mtKD97NXgu8VVEuyf9Nurib+GBY3AnRkDbT1m63uEHKUjdB8fWOibjE9VL5YYI W7zyt6fIxBTvaJ6wpuGzXLN1mpYGzjA/Hq46O1v76BDwa60iQy6vgr+GzSkxLUpJjR0PIq YrJKfD+ONd5Trq0xBIg2rZcJEUl8Kl4= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4E1465C6C68; Thu, 5 Dec 2024 12:43:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38850C4CED1; Thu, 5 Dec 2024 12:44:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733402641; bh=hH/feaT2gz9NqK3tB79JnG5zjei8Pi0HnK6xbfrsarg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=W3ojwcXPq0jl7Rbx6JHQhrdyrfY5qtif/mBNO7qgiLnLruKRTHHTc6c7YGCR+yKrC XbSMASmHaAFBNOT0mSpHXrRaGAfzN6B21BXUGd3rXitHMRwfZTNHIKYFahzyM+7pBe mg3VrYsfFGgAoSBbeV2MJjh/tUhz4zS4JJOHdbYAzRIGfSqadclhcSBhCeAdPwtZpL bW7pZqFc4QVNknScRDzNYHgFEnTIdrsSfh1uNrc2JhTNtFKr+zoewCJXcn1/cRu5mi M3YvCfBBSjd70EDhw0lGKF6Eqkv1U3D+LrZQtP055g4I1DmcOd2n5ReOmwCiZoicAZ o+KJ27kJW+60w== Date: Thu, 5 Dec 2024 13:43:58 +0100 From: Alejandro Colomar To: Lorenzo Stoakes Cc: linux-man@vger.kernel.org, Suren Baghdasaryan , "Liam R . Howlett" , Matthew Wilcox , Vlastimil Babka , Jann Horn , linux-mm@kvack.org Subject: git repositories and branches (was: [PATCH man-pages v4] madvise.2: ...) Message-ID: <20241205124358.l4vzdinfzqngl7pn@devuan> References: <20241205104125.67518-1-lorenzo.stoakes@oracle.com> <20241205122037.7u2lbjix6mawoepr@devuan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="i6vksizwoyi7d5ju" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 115551C0007 X-Stat-Signature: z54q7zuidopn5t9fnh5zhej4pdbtf479 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1733402635-904509 X-HE-Meta: U2FsdGVkX1/u+N9o/SW60//tLfMXOmgY58XMSeow0JubFwV+Do9StgjKGYfxdqP/F1AVLxW/s5lcaY5ZIsF41yzpcWOE4WtedgaYYphEysqqoFLrS2Pft6uc9f0ekH5nyfpKcV36gEgqamZG8hrN05xmo47IjcBjYFJFPwu+dqnDcWO3D8OrIQgut8zQ62NSy5ItJetFxzUOXErs1HZcuiYKDLt8Tgj3/ppyqR2MKfUBEADBPKZ1V9E7X/bBoaQIjJLMnIT1G5cKQI8UQECkrO4Xg/JmnmkPJi6LoBLrrA60Y4MPj59qHMXO2qBeThs2/3140ExwswvDAJGmn9CXD4oauZBDUq0hI98N2Hatft0Xtwfy4sFDv7imnaaHxYEG1HW+JeKYNyzP9dtomAY2aSM3rdfYJFHi/aSoOpzxuCVT60qsaNFDIxah1+LJNPpWFxcH/6ZYDvzJB8p9zD2RubCi61ddeFZ9L3sdqkRtm4ld9r5O2WfYT2s9YWSjTMv4IqoBsWxxSjyHiw1oLJxYH0wuDQcEfKeuihdon+IbadZpOqDmBeWmfOF+k32T0X9ya2Y2Z87t7uvkOBU5/k71aZjdjsNNlqiLVWPrWWo0sU8OQCuIAIcFyWPEjcVHuo+SIufTiUuYx/fTQM0GoZD3cDGmras1u6JLFwVnNd8G9AUH2b1mwoMjemlR+prYtwEeooadn+DnXNtCXrBxB/5gRYcGqSSM5KwY4Yevy75l0xAiZTGyJTkvkAyqfD3SKMF6MX/YGnWGUxoH9RinTGI3+1YhYRfv95p73utRRveyu5aA42LY9Qkx+XQXaIqKmyPmptRVdpr/roAkfz6LD3cHS0NSHbwX64gwkeh+pH2ImkAEa5B19UDaSGyKX/yDq3jEb2VpbFNMCOJDtYrg5aW1SejjTM+oMAMWSWg0P3+LeZJz12gikI9bDKmkw2sHuLuA0i8aNWaQrNqXSN7+1ly tdTyf1Tw aihK6USQxj7oI1hvdvhOCslJ1H8cz0UJ6Qm8FNLNesbdo0glTk+xZccESWffiuCt0FZ8hSlhgtqWuCjhVQtUFJb99p5w4rGakF6wxFA64JIwXW+T0/EQGZD//MSxXu5v3C0u/uIfSnmHeLnXKiy017bMGd49sz7H9JHKSLJwtZqh3mBuO84ZvD6olWzLXlA30WV14Bg6Ka6VrQ54510Wsg8wzJ/2GKpp7HDozHArS5Sc2PCtOCDGzEbut1llshkCY09pI1mC217+ADqiYQbW9oqGVnsR49C16MzPD+WvSpZwm1wW1KcTLpPxMbeCZc5bBqN8y/kNnkPTa2OLSXIwQMYtpI92FNUFAK6BVtXFrhVdVYAWLTnvfk8jMuevy/+hVJYn1EwuB0bEi9Rh5rXHOd0x4806jLEHl4LRvWkfiQGWF7wElmAgn4lTNfA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: --i6vksizwoyi7d5ju Content-Type: text/plain; protected-headers=v1; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: git repositories and branches (was: [PATCH man-pages v4] madvise.2: ...) MIME-Version: 1.0 Hi Lorenzo, On Thu, Dec 05, 2024 at 12:26:56PM +0000, Lorenzo Stoakes wrote: > On Thu, Dec 05, 2024 at 01:20:37PM +0100, Alejandro Colomar wrote: > > Thanks for the patch! I've applied it, with some minor tweaks. See > > comments below. > > >=20 > Thanks all seems reasonable. >=20 > Just a quick question for future changes - I see you reference > git://www.alejandro-colomar.es/src/alx/linux/man-pages/man-pages.git - but > I've been working against > git://git.kernel.org/pub/scm/docs/man-pages/man-pages.git - is the latter > occasionally synced from the former? The 'main' branch in that server is usually at the same point that 'master' at . They're the same thing, just on different servers. Then, there's a 'contrib' branch in my server, which I use to buffer patches I apply from others. That allows me to amend typos and other mistakes (or even drop patches) before pushing to master. Here's my workflow: 1) I push always first to 'contrib', which triggers CI on my server, and lets me know if all's good (it runs many linters set up in the build system). 2) Then I let know the contributor I've pushed there. Then I leave it there for a day or so. 3) If I don't find anything wrong in a day or so, I push to 'main' in my server, which regenerates the PDF book in my website: . 4) After the PDF is generated correctly, I push to 's 'master'. You can think of this contrib branch as a 'next' from the kernel, but I pull from it much more often. > Or should I be working against your > personal repo for future changes? Most of the time, it's enough to use the 'master' branch from . In some cases, for example if you have several patches for a single page, if I have applied some of them, and you need to rebase, it would make sense to base on that 'contrib' branch. Or if I have applied some changes recently to it and might conflict with yours, I'll ask you to rebase. Cheers, Alex >=20 > Thanks, Lorenzo --=20 --i6vksizwoyi7d5ju Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE6jqH8KTroDDkXfJAnowa+77/2zIFAmdRoAcACgkQnowa+77/ 2zJpww/7BwxSIH+HXQywdhGZaaQNLTt/+LMtngfkeoIQsTO/2059ED7phm1exOSt HQX7V6cyMVWgcjjwPH8rKbx4bBhKLrFNuaNBTmEXsoj6vrlotqY5U8yjbYcs7vb6 iMYBb8DZn9h9UUYVq4cb+RNd6cDTolNyvUfOF/5ZOYyq2Hv5Hky/AkyvuJNtm7GR LFwlsqvZyZOYVAQx4jxPo1S8dQ3A8i3wC6PDVEcfp1JVUkIxaQ3JKXFZLuiYBWiI Ts9hwhj94hKQGhIQyWuO22+Pk5gZ/LFvgV+QuZM4i4FnNV+69MN33HFpSiawKK8J euoQ62r18AhX0SefzfcKL4HZ3rtD26XNoeEHXu0Xl4io1331Q6NH5rpP3ylqT7z+ luKCLu9sU4af8uGrQs9HFfDkch8i4KkQMxXsJluwhvkgB8h9VvrJkLhFuPU7jUET ynMIu4N4rjbjIPCkhf5D50Ug8SQV0VFA66+tMP7xl4XeP5va1X/YWIm/U0mxC67f 5UXxT/iX+5vaiy8BszQ33LrogABrMHnu4iz4/We6O/qi8XR85QLS+7q1Dl/mYODx kuk+7Famopd88z+/Ntf4Ta1beZaNLytcLAowV8hxz0ioII942CtpXKMjxoaFftNS JQtI/SzTH8HUQ8hlBKVMoisBrwZuldq5nWBvaizoDIifZjuZla8= =qOMa -----END PGP SIGNATURE----- --i6vksizwoyi7d5ju--