From patchwork Tue Sep 8 22:05:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360131 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=UNywvHWD; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmK322Rsjz9sRK for ; Wed, 9 Sep 2020 08:05:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DAFB286508; Tue, 8 Sep 2020 22:05:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 98hG8_XIrvqk; Tue, 8 Sep 2020 22:05:32 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5696486A99; Tue, 8 Sep 2020 22:05:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4B1FC1BF5B4 for ; Tue, 8 Sep 2020 22:05:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4467086A99 for ; Tue, 8 Sep 2020 22:05:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c3Ms39GiVJQM for ; Tue, 8 Sep 2020 22:05:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs04.rockwellcollins.com (ch3vs04.rockwellcollins.com [205.175.226.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E211186508 for ; Tue, 8 Sep 2020 22:05:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=12P6hLyZoCpoZo6f0/zFvfJCUTZZwwo/xIjmyX1He1c=; b=UNywvHWDZL57n7dT7/OohaJbjxGhupKwqsoS6+D0s8EXbnrUMDEfTfO6 +Le7J/2AD4fJEJx5ilVHg9ebkAJo9XhdgyALUL0a4rrZITV0SSp68fy9P pLVrbpty9Iad6fK2lb4qw+h63xSPCkZeDNexJ1gmVhDAyRHdoS3LMk/N+ iXnBK8nJIbqF3BH84vY0NtDZFR3u4JySUlAUmixk8LX03r5fIHW8+8sX2 LZYidV1+hl8DbHeXpeVphcT5uQgBDRThIs8df4+CtFNijqGwzGlZeZs49 WmkhGJLZDJwDaOqa43rCiBUh4RN5TWiCCpxlPlNWkdAS6aTB5h9NR4r1u A==; IronPort-SDR: +eOEB2ZEGGlTvBSZ6Qx3ff+3Tg6zv4PryN0OXYkMOiRQcA+hBm/SRmvp/Txax3nIFbeguuE2Tn Wmtlafo7OMQsdqMEJ5GCRhyfsV5dfXUllLrX9fHaZJe1Pir5KaL77bI5IR2etZ2ap0vRh71rhh 93SfL9NSBmfhKp/QdvGMKgoLeWNJcaGVZKlN0mpk26zJVS2H/07X4MIMAKSEVeNSRxZMuB1YK0 OlBjgF1xOHtILYGCSOZ6pMGiehsXbqF+bREFRBHHw88gphqTPW2Het2a+Xop6i6LoOCrR7hG8x m7I= Received: from ofwch3n02.rockwellcollins.com (HELO crulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:05:28 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by crulimr02.rockwellcollins.com (Postfix) with ESMTP id 30773600F7; Tue, 8 Sep 2020 17:05:28 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:05:25 -0500 Message-Id: <20200908220525.26283-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 1/1] docs/manual: Add section about contributing to release branches X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brandon Maier , yann.morin.1998@free.fr, Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Brandon Maier --- Changes v2: - Forgot to save before commiting, mention to base branch of release branch, add example docs/manual/contribute.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 11d8811b44..85d7111735 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -371,6 +371,22 @@ in the following cases: * whenever you feel it will help presenting your work, your choices, the review process, etc. +==== Patches for release branches + +When fixing bugs on a release branch, bugs should be fixed on the master +branch first. Then the release branch maintainer can backport the fixes +to the correct release branches. But some bugs may apply only to a +specific release, for example because it is using an older version of a +package. In that case, patches should be based off the release branch, +and the patch's subject prefix must include the release branch name (for +example "[PATCH 2020.02.x]"). This can be done with the +git +format-patch+ flag +--subject-prefix+. + +--------------------- +$ git format-patch --subject-prefix "PATCH 2020.02.x" \ + -M -s -o outgoing origin/2020.02.x +--------------------- + ==== Patch revision changelog When improvements are requested, the new revision of each commit