From patchwork Sat Jul 8 01:05:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13305502 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29C53C001B0 for ; Sat, 8 Jul 2023 01:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232698AbjGHBGH (ORCPT ); Fri, 7 Jul 2023 21:06:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231335AbjGHBGF (ORCPT ); Fri, 7 Jul 2023 21:06:05 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D10E2210C for ; Fri, 7 Jul 2023 18:06:03 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fbc77e76abso27348255e9.1 for ; Fri, 07 Jul 2023 18:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688778362; x=1691370362; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=fUOGi/S8harMIkeMlwlGX4B7j1x/qNSxJP2y5l0vrds=; b=aMZr9x93C3p6wv0+doSPjtXoQYqWXAKfkIi8O5G0HuBLw5zSaU/o7xQPPV/7zCbGVS Qpf/1QxY3RvG/dU1P8mKx/P7d333oOz/xggnMAPKVBXD+djKLchJ7kanGA3uuYwseGgC dpcuolVQn98prwJgh1BlJf9hHqw5CSPrxJcp2LOENg+qyfYv7FE6pPygM0CnGAzdqeEk qHD4wR7n1N+83RlpNENALJPNnXmyfxvz4duEVfLzXD1dCRYVqMYq4ta6oqnpQhjMFTW1 j0tK3DwKw0V+UMjMeSvgAtMEp0+BA2zn5KRMOGGQBXL1FWjC1eKYsO1pgqkO3cWP8f0i gXig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778362; x=1691370362; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fUOGi/S8harMIkeMlwlGX4B7j1x/qNSxJP2y5l0vrds=; b=apTtgGzayFpKILZxqQGdrsgpJse89LcVxV8rS185rsh/lw6Xl1mMvdzoMMGAw4VyUK FS3tqTHDYtXFMLddV7zxzsNTJmsf5LVeO1bK7SpZAJ3zdhAncixJ1P+b3iHPdC9SJsET 6fT3gslDf7rU47XMhg0JyH8ZUbTH2c2c8N+JKeDDLGLMNNexAwKQ5UjpZcMJMHSqLFvF S+4/Y3//GzOD8fYsjbaF8zXeQXQHu6JjG0LUMRObYJu4ZM9RFPhE6uuKFSMkf4tmJ4DS 0vtERmQwdgKUZwy+WSbuYuNYBjP7n4QoRtu2oOz+PpAYxuAFHAgZkmvISe+QwyRXA3yA MgQQ== X-Gm-Message-State: ABy/qLalAbl8pOA4FUdV7/fBYMqfPYBMAFZlARnCZ12wnQgeJoh7aVmu h244NL9nMVlvaKC320FLcRw/ovDTp5A= X-Google-Smtp-Source: APBJJlGupvVykwWqaX17R4XAFuU+jBKqSxo5H7npHXJ17CoQ/97zOqIncU2lcG0sDtmnt+3nLzbWcQ== X-Received: by 2002:a7b:c3d0:0:b0:3fc:1a6:7764 with SMTP id t16-20020a7bc3d0000000b003fc01a67764mr1471721wmj.16.1688778362068; Fri, 07 Jul 2023 18:06:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id l20-20020a7bc354000000b003fbb8c7c799sm3784648wmj.30.2023.07.07.18.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:06:01 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 08 Jul 2023 01:05:55 +0000 Subject: [PATCH 1/5] SubmittingPatches: reword awkward phrasing Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Signed-off-by: Linus Arver --- Documentation/SubmittingPatches | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index b218e273570..b89678cedc3 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -3,8 +3,8 @@ Submitting Patches == Guidelines -Here are some guidelines for people who want to contribute their code to this -software. There is also a link:MyFirstContribution.html[step-by-step tutorial] +Here are some guidelines for contributing back to this +project. There is also a link:MyFirstContribution.html[step-by-step tutorial] available which covers many of these same guidelines. [[base-branch]] From patchwork Sat Jul 8 01:05:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13305501 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1AB0FEB64DA for ; Sat, 8 Jul 2023 01:06:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232548AbjGHBGJ (ORCPT ); Fri, 7 Jul 2023 21:06:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229552AbjGHBGG (ORCPT ); Fri, 7 Jul 2023 21:06:06 -0400 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AB552123 for ; Fri, 7 Jul 2023 18:06:05 -0700 (PDT) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3141c3a7547so2608172f8f.2 for ; Fri, 07 Jul 2023 18:06:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688778363; x=1691370363; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=rtt4l1hDHsSVGpEIG6TobceLJcm3n/47J/3RzNPJiUg=; b=KVlHRoVo+CP9OniywIT3R2Cge4pkRepyOX8cFqlFUPkMDmG8V9Mv41CPqCls5U6XPJ CAOVyi05di2TQK6J0dJAvhXS+DwkPAsbUWDzcQZjsWxz2JFFG6Qypdmi1swrg2d3esvX 9CZZcgfuvqwJAsDti1+LGp5fPn8n9pH2O0QstWLapiy/DDHeu14dZIfI6/4ddkLHmDTL aw0jXPcP26YJeQEcTICytYEt0WhNm0xaFqcSMDmdvXcbi4BmLncYVydCoauT6H52/Dzy fv7Dkw+Se3DqBL3beAb5bm9bIdZ/HZHNpdF/qglBt2PYc+kyUh++EbjXLC5G3Wb/t9jK pQMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778363; x=1691370363; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rtt4l1hDHsSVGpEIG6TobceLJcm3n/47J/3RzNPJiUg=; b=FtJ1tXQhJvSB2LXnYvKZ1PtanFzK/6mYs2H7E0dJX0EgWwrMd41T7uo43xw7HYj0AW sFk5u8K1Jv3qcEQDOMyhxvNGt/pMuccZ/G9KbA3wFZoSprGwmikRhbGyQVj56lI+Kie/ E5v8Y5Nm9awDEpyL6d6oHCCoWGYoEqi4/HUvExKrJcO+DFaZKCtYS2U9FIE7u4IYMpbb w6HpQXZXuX/jkBtTkSSGo30GnbRmJCs3cAIr9ncA1rPso/Cw4sBm5/oles+ajSv6ZtPW np6D1donvd93ntXpyeK+Hi2LOyjasbLUqzKQjVoaBiszLOhaeWuNgA5m/j8ci6hiin3r Z0dw== X-Gm-Message-State: ABy/qLb/r+fDYSC219ERBIFIx/lv8N7lsUWHm75UvYk2bUmBjvf+oYun M+4CKjiZ3qncwAzDoikA4gggKHG2Nfw= X-Google-Smtp-Source: APBJJlHqGlKgN6WZSQTGgK/w1zOeq21CRtKW/gR9vRSG5hH+p2Wug8sCNo8xxRev0GR1BfIrh/LiHg== X-Received: by 2002:adf:eb0d:0:b0:30a:e9cb:1a2e with SMTP id s13-20020adfeb0d000000b0030ae9cb1a2emr4666003wrn.65.1688778363311; Fri, 07 Jul 2023 18:06:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j23-20020a5d4537000000b003141e629cb6sm5658865wra.101.2023.07.07.18.06.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:06:02 -0700 (PDT) Message-Id: <203ed19dd1b72a8085af05359d5a226b94fe2c7f.1688778359.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 08 Jul 2023 01:05:56 +0000 Subject: [PATCH 2/5] SubmittingPatches: be more explicit Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Signed-off-by: Linus Arver --- Documentation/SubmittingPatches | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index b89678cedc3..5611580fb4c 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -8,7 +8,7 @@ project. There is also a link:MyFirstContribution.html[step-by-step tutorial] available which covers many of these same guidelines. [[base-branch]] -=== Decide what to base your work on. +=== Decide which branch to base your work on. In general, always base your work on the oldest branch that your change is relevant to. @@ -317,8 +317,8 @@ Please make sure your patch does not add commented out debugging code, or include any extra files which do not relate to what your patch is trying to achieve. Make sure to review your patch after generating it, to ensure accuracy. Before -sending out, please make sure it cleanly applies to the base you -have chosen in the "Decide what to base your work on" section, +sending out, please make sure it cleanly applies to the branch you +have chosen in the "Decide which branch to base your work on" section, and unless it targets the `master` branch (which is the default), mark your patches as such. From patchwork Sat Jul 8 01:05:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13305503 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55178EB64D9 for ; Sat, 8 Jul 2023 01:06:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229755AbjGHBGJ (ORCPT ); Fri, 7 Jul 2023 21:06:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232693AbjGHBGH (ORCPT ); Fri, 7 Jul 2023 21:06:07 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19B05210C for ; Fri, 7 Jul 2023 18:06:06 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-313f1085ac2so2505961f8f.1 for ; Fri, 07 Jul 2023 18:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688778364; x=1691370364; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=fRK67iEkSwyCOlZn0KK2nItT0FjFXldI5YwsF3b15JA=; b=Qv3A/84L+1LU1LqZuZ8lf8upPc+KvDaK7ceTYsvq2VoHI2sfx8Xu/zANIWxGNMArfD dKU2TwNsgjVVCkl8G58WbSD7j8m8zyx3lqmAAojRPUfe7QU7Xt4O3vlr5LLAJ9g78Tlt xiq3TjaEDrn9ejqB6E7nBUWAYzSw40eXDbJj9Hmyetxlf3j/clCdoG6CKHW1tXrcUSOL amsm09b9phEmqHGA1O/K3C6vYuWgM0QrVKVlhUtUlxdFD8R0zEEsaSSSa80KflGrVd3C yJVKNVRbIWeCsFKbJnviT8LWF2WuHrdpSbxTNAhsXI7GWNFTc+qixvbYvFtYk6oSqeXI wTiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778364; x=1691370364; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fRK67iEkSwyCOlZn0KK2nItT0FjFXldI5YwsF3b15JA=; b=Ue6pagoC0I1ooYheC7F9lwf/bYrSvzozaobwgng+lTWWQTH72v24iyVvK08sQTe61v PFO4XJm/tePoOjzwWuu04vG5HoRvA4rsvJ7fUQUxqajevgGHLjfXTcDnfeloHsj3tw6h 5yVMKEXCp/oCl/oBC90YErg1XQO2FqUG1hmqt5qj3SeMbykwjVKS2ErWb/qbEt08P9HZ mVnYuaiKx/B6AkIqpAtxeuJuVPB/ynIY6ebucFX1ITzn1RKw01g9l4mxAqkZJY3pKkJr EtdwhKRRiOHNWcAB7nXQUTVcVlKMSZ2ht4gNY+BYemcz74dkb7rZAqOCsL0pju1UyFOo XxsQ== X-Gm-Message-State: ABy/qLZCef0Drfv+frC1Al55tlktl180N3FtwffaV2g4JJeQbs3fzYmJ VOnnSKxf3r8qhr/tE+Jcy8PehH+ZkgE= X-Google-Smtp-Source: APBJJlEtjXjSv2iE8qkqheXMKKzVMnqB7PT1VmcPuL4ovC/rYwLkbSvxCvWQ0a1bPPchb2gdLg8kQA== X-Received: by 2002:adf:f8c3:0:b0:314:30ed:9b55 with SMTP id f3-20020adff8c3000000b0031430ed9b55mr1518928wrq.15.1688778364322; Fri, 07 Jul 2023 18:06:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p11-20020a056000018b00b003141e86e751sm5725015wrx.5.2023.07.07.18.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:06:03 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sat, 08 Jul 2023 01:05:57 +0000 Subject: [PATCH 3/5] SubmittingPatches: discuss subsystems separately from git.git Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver The discussion around subsystems disrupts the flow of discussion in the surrounding area, which only deals with branches used for the git.git project. So move this bullet point out to the end. Signed-off-by: Linus Arver --- Documentation/SubmittingPatches | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 5611580fb4c..48918181f49 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -35,14 +35,14 @@ change is relevant to. to stabilize, you would have to rebase it (see the "depends on other topics" above). -* Some parts of the system have dedicated maintainers with their own - repositories (see the section "Subsystems" below). Changes to - these parts should be based on their trees. - To find the tip of a topic branch, run `git log --first-parent master..seen` and look for the merge commit. The second parent of this commit is the tip of the topic branch. +Note that some parts of the system have dedicated maintainers with their +own separate source code repositories (see the section "Subsystems" +below). + [[separate-commits]] === Make separate commits for logically separate changes. From patchwork Sat Jul 8 01:05:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13305504 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24C4BC001B0 for ; Sat, 8 Jul 2023 01:06:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232889AbjGHBGR (ORCPT ); Fri, 7 Jul 2023 21:06:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232785AbjGHBGI (ORCPT ); Fri, 7 Jul 2023 21:06:08 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67242211F for ; Fri, 7 Jul 2023 18:06:07 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-313f1085ac2so2505974f8f.1 for ; Fri, 07 Jul 2023 18:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688778365; x=1691370365; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=t3tcYGWRrZtBYKlxazEkyD18OsVucbvfLwSwQMVbCPs=; b=A/tKLlMVuSen5XKghydLrgH5YOYjxpfOnmJM/VXlbbmY86kT9VwTDHIS1oRvNEDH7O v7kB2yB2ba+xmko6qfqdi0ffkoATb3NElnxpi7i/khNV2UYxQOe9kmT3iMtLQC9GEPFR 3Jj45sYWjCfNYY8y3eCWG+u+IqgmiHdwqKlod8jRRWIpPH9tKVMUygi2NAB25RHZ1Ez3 xOOE0SlYzGTnmnWOUDa4BjcSWVc8C/DAdVrPzNt1IpXlp3xDu6uKY+sLSMpurecic8Zr SYi5Gob7jG2TCyT+rZ47UPEC2/szeHp0yrOQDfbhMXtyedLWGVaazpR+G1QfAsLPrbFM Ov+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778365; x=1691370365; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t3tcYGWRrZtBYKlxazEkyD18OsVucbvfLwSwQMVbCPs=; b=JBKrS2YmKhQAZ9wrMgEFBPg0+/UPFDUe4kFUQUCEAEEQBPayzQk7yHUWRTLr545Ivl uMZdMihjGO9ojO0OXoCizJ4939T6bqS4Y7UJFfGgBLNKKOHfkpBrADUCOwnn06hmGrP8 bMlh8BYTjCbKj2ttnWdcJ+kdgVHlzMpqnExNNx0A6mk03VdCWGqxg2YGCxnRKtCkdgTM Un0KgeIslRI0boNeX1+WwugjFMczZhVALyoqTVeQ4LQ70e273dQ8O2PvFFRCqq8I4mYA 3EwQrZRkfZxb7a69hfRN9pyIytNGsYXmdubNcRBjSlNnxdUJK0prs0SvXwhwFvYmLnb1 r4Gw== X-Gm-Message-State: ABy/qLalmxrJ6hbGip6FaRGMgG0XoJlF+M1bw/I4/1poK37sgecEp0xZ YHb67HyDiDwFJ0JsJapnEGOmLD43mRw= X-Google-Smtp-Source: APBJJlGflnYYJuNy6tHhtA9QssZsMwFRuUWtmKCpQwnnTiL0qwIHlP3uHH0g1zK3ZTmA/YkF7MZr6A== X-Received: by 2002:a5d:54d2:0:b0:313:f5f8:a331 with SMTP id x18-20020a5d54d2000000b00313f5f8a331mr4714529wrv.34.1688778365612; Fri, 07 Jul 2023 18:06:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b18-20020adfe312000000b0031455482d1fsm4459156wrj.47.2023.07.07.18.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:06:05 -0700 (PDT) Message-Id: <55bed55cb8859ac7b5b4f464232258f410b4d202.1688778359.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 08 Jul 2023 01:05:58 +0000 Subject: [PATCH 4/5] SubmittingPatches: remove confusing guidance about base branches Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver The guidance to "base your work on the oldest branch that your change is relevant to" was added in d0c26f0f56 (SubmittingPatches: Add new section about what to base work on, 2010-04-19). That commit also added the bullet points which describe the scenarios where one would use one of "maint", "master", "next", and "seen" ("pu" in the original as that was the name of this branch before it was renamed, per 828197de8f (docs: adjust for the recent rename of `pu` to `seen`, 2020-06-25)). The underlying principle of this guidance was probably something like "base your work on the earlier-in-history branch so your change can be merged forward". However, this principle is already concretely explained in the accompanying bullet points. This principle should only come into play if none of the scenarios described in the bullet points apply --- and such a situation would be exceedingly rare. Also, the guidance's wording of using the "oldest" branch is confusing when read together with the rest of this section, because three of the four named branches discussed ("master", "next", and "seen") move frequently enough to not be considered "old" at all. For these reasons, remove the guidance _without_ preserving the meaning of the underlying principle, and instead add an overview of the four named branches. Helped-by: Jonathan Nieder Signed-off-by: Linus Arver --- Documentation/SubmittingPatches | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 48918181f49..ef39808f568 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -10,8 +10,15 @@ available which covers many of these same guidelines. [[base-branch]] === Decide which branch to base your work on. -In general, always base your work on the oldest branch that your -change is relevant to. +The following branches are the typical starting points for new work: + +* maint +* master +* next +* seen + +These branches are explained in detail in linkgit:gitworkflows[7]. +Choose the appropriate branch depending on the following scenarios: * A bugfix should be based on `maint` in general. If the bug is not present in `maint`, base it on `master`. For a bug that's not yet From patchwork Sat Jul 8 01:05:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver X-Patchwork-Id: 13305505 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F83CEB64DA for ; Sat, 8 Jul 2023 01:06:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232934AbjGHBGS (ORCPT ); Fri, 7 Jul 2023 21:06:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232878AbjGHBGJ (ORCPT ); Fri, 7 Jul 2023 21:06:09 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23F3F212D for ; Fri, 7 Jul 2023 18:06:08 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fbc1218262so27960145e9.3 for ; Fri, 07 Jul 2023 18:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688778366; x=1691370366; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=8kAShDloEwZOOctxV4C0zs/HnE4QRhndj0mHCwQnrCM=; b=dVGv8zG7eQoThM98sfmIsLrTLaZnWdyfMjAV6TkJ1jEsabnsTTHcCJixhRpWZ6txC+ hdt6Kx4NJ7M52tQyC8PlYhOd3GJDou1a8HYqGwfuz3a18ZnFDnbI2ghl2aucd+DKMTjw mns8pZi133Ih6EfiSp08Wt94BQwThT0bJPx6325jHq0bcDFbbowv91xV6HPYJkK+4G+l L9xwpIo32tZds8KKAj1EbnRiEXfvbbVn6I/mpYbJw2X7ICaj0aMbRmWfUdZqB4Vr+NZ8 JOBWSTdjBKxbw4QYqMkgHGt0bdrtxl7hzyFedAqdODexssxoUVcYxJrRUAlGxWb2x1bJ JPTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688778366; x=1691370366; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8kAShDloEwZOOctxV4C0zs/HnE4QRhndj0mHCwQnrCM=; b=hWLfmzz/doaeV7K9MDn/aUVp35+TEJIGlf48BiNjzO7JIrPCQPF+XDi1UKc8vPsKAs rXrCdc6+I8uDt4aEwRf/NUrZ7uQf8rwsy1eIm02kZ89YFcE8gVaPknl1JdW/H+fCTaRU ghM1IdOEnwWEodduAckDj0tfB5NZpY9QlO447NTW1pkG2khxAibyeQQFeuNTTgt8xCND 8u0fFmNwX1B2jhH7QWjbsFgx+H17JFSdjCnYokOgXra2PxQLloT2vrSv+Ds1PFaxpCKG e9JMvOmBcXNZEVzzzBm5mHhQMpECcJ64LGR657RxCEV7JVi9O/bJk0urr0FVeTx3sDbT 0LRw== X-Gm-Message-State: ABy/qLYSu2C2ql3CgTtLFasfuhAhDD9DaCiDTaFt0jFTcJSaxp9KgSs5 L63q8LUqdMU+HAU0jddntswx2iHi3Tg= X-Google-Smtp-Source: APBJJlEj77ysWd+ccbXeafRarCFvuiWgFl1Sc1A7QjSWo+75KniGksvuyBZysfvH/0peHZVPYHpyWQ== X-Received: by 2002:a7b:c389:0:b0:3fc:9f:e75c with SMTP id s9-20020a7bc389000000b003fc009fe75cmr2120035wmj.11.1688778366434; Fri, 07 Jul 2023 18:06:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n20-20020a7bc5d4000000b003fa8dbb7b5dsm3773464wmk.25.2023.07.07.18.06.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 18:06:06 -0700 (PDT) Message-Id: <1db7a1be27fa51113dcb54013297cda7b6b441d7.1688778359.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sat, 08 Jul 2023 01:05:59 +0000 Subject: [PATCH 5/5] SubmittingPatches: define topic branches Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Linus Arver , Linus Arver Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Linus Arver From: Linus Arver Signed-off-by: Linus Arver --- Documentation/SubmittingPatches | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index ef39808f568..6fb96e6537f 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -17,7 +17,12 @@ The following branches are the typical starting points for new work: * next * seen -These branches are explained in detail in linkgit:gitworkflows[7]. +These branches are explained in detail in linkgit:gitworkflows[7]. There are +also "topic" branches, which contain work from other contributors. Topic +branches are created by the Git maintainer (in their fork) to organize the +current set of incoming contributions from the mailing list, and are enumerated +in the regular "What's cooking in git.git" announcements. + Choose the appropriate branch depending on the following scenarios: * A bugfix should be based on `maint` in general. If the bug is not