From patchwork Tue Sep 8 22:01:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360123 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.138; helo=whitealder.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=Id0of2UP; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmJyp0bbDz9sRK for ; Wed, 9 Sep 2020 08:01:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C07B8701E; Tue, 8 Sep 2020 22:01:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UD6gl4CYimAg; Tue, 8 Sep 2020 22:01:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0750386FF8; Tue, 8 Sep 2020 22:01:47 +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 837971BF3AD for ; Tue, 8 Sep 2020 22:01:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7F77986EC2 for ; Tue, 8 Sep 2020 22:01:46 +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 JCV0Kz_slFLy for ; Tue, 8 Sep 2020 22:01:45 +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 A44F686EBB for ; Tue, 8 Sep 2020 22:01:45 +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=dsRA+NZvvYmW2WZDedcea8TH0UzzNq/TYfeRXLZeqAI=; b=Id0of2UPt/XjAicT9c8ELjkIv2/FvrN/Q2bPzqdrPENNyG7RQ2KQshcI D1kHgzi7qIbyPoOoT4q8HvKBrjiNqG2/yF7pbXXEYMTIC1B7LhnA+w/RG ctl65H3brDdVtxS+zO+M09Wu6qfdg94ARystNIp2LrEJTWXxiJG6/xfip 22wgMDkMabVno69DO9xTLhlJj3SUDVv2EeG2MLI8iDgbMzg0bVGwbIbHw VscmG/SRxJcwzHPo161pZLR+LdnXixdEqxRTBPTl4XeEC3HP5u43868Fo E6szHNasSKsea4SPt1TQQnz3DVJheWOhEEseRzq8ZXh/UwbMI1HgTio/e Q==; IronPort-SDR: fdeBi9Ozx8R6tEuOoAiaGu+P2cQ29/gy8Hjei4vyXvLhMuKzU6OuZfLA7tIN6LpxkrwE3t3Y4P ks5p0loWyDwE0Z7EZyqnqjwCuHJX8YC7p+vzqJhNg96GCYVzVfFmrI0Bw7jyDUHoHfBKhIUnCD y+KPuUPgeXeXfZRu088Lx5tq4NlfwhwCCL2IbxGq80nn34AvsPn4270Iy+Xbc8bSA1I6nLfoHA 2z0Mwd3aFRu0ew9S68my/AKmvUxh6eKSaHbi9gp/QiRyZO5E0FjXn28lRyRDLuMrTDAi42dJc0 3v8= Received: from ofwch3n02.rockwellcollins.com (HELO dtulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:01:44 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by dtulimr02.rockwellcollins.com (Postfix) with ESMTP id 670372006C; Tue, 8 Sep 2020 17:01:44 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:01:20 -0500 Message-Id: <20200908220119.90236-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 --- docs/manual/contribute.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 11d8811b44..2b3d7e7302 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -371,6 +371,21 @@ 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 applicable 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, add the branch name to the patch's subject +prefix. 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