From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from co1outboundpool.messaging.microsoft.com (co1ehsobe004.messaging.microsoft.com [216.32.180.187]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 8F52FE01409 for ; Tue, 4 Jun 2013 11:28:54 -0700 (PDT) Received: from mail177-co1-R.bigfish.com (10.243.78.226) by CO1EHSOBE023.bigfish.com (10.243.66.86) with Microsoft SMTP Server id 14.1.225.23; Tue, 4 Jun 2013 18:28:53 +0000 Received: from mail177-co1 (localhost [127.0.0.1]) by mail177-co1-R.bigfish.com (Postfix) with ESMTP id 40A0A98008E for ; Tue, 4 Jun 2013 18:28:53 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: -1 X-BigFish: VS-1(zz1dbaIdb82hzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzzz2dh2a8h668h839h947hd25he5bhf0ah1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h1765h18e1h190ch1946h19b4h19c3h1ad9h1b0ah1d0ch1d2eh1d3fh1dc1h1dfeh1dffh1155h) Received: from mail177-co1 (localhost.localdomain [127.0.0.1]) by mail177-co1 (MessageSwitch) id 1370370531228034_23690; Tue, 4 Jun 2013 18:28:51 +0000 (UTC) Received: from CO1EHSMHS026.bigfish.com (unknown [10.243.78.230]) by mail177-co1.bigfish.com (Postfix) with ESMTP id 35CB990007A for ; Tue, 4 Jun 2013 18:28:51 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS026.bigfish.com (10.243.66.36) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 4 Jun 2013 18:28:50 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-005.039d.mgd.msft.net (10.84.1.17) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 4 Jun 2013 18:30:02 +0000 Received: from [10.29.244.5] ([10.29.244.5]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r54ISm5C010884 for ; Tue, 4 Jun 2013 11:28:49 -0700 Message-ID: <51AE316F.4040109@freescale.com> Date: Tue, 4 Jun 2013 15:26:55 -0300 From: Daiane Angolini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: "meta-freescale@yoctoproject.org" X-OriginatorOrg: freescale.com Subject: Merge protocol - proposal X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Jun 2013 18:28:54 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit I know I'm completely late about "Merge Protocol Proposal" I had said I would send it 2 weeks after the release. And I do have a lot of excuses (or runarounds), but it doesn't matter. Please, see below my proposal for merge protocol. I hope we can get at least 10 people "voting" on this topic. Please, let me know what you think. Regards, Daiane *Development branch* Any development or bug fix MUST be done over master at first. If you need any bugfix on your stable branch, you MUST fix the same bug on master, except when it is not applicable to master, for example (e.g: newer BSP release has fixed the bug). The standard review window for new features will be of one week, unless cover letter expands this period. New patch versions expands the review window by one day. The standard review window for bugfixes is one day, unless cover letter expands this period. New patch versions expands the review window by one day. In case the patch has no comment, it will be applied after the review window. *Stable branch* No new feature will be accepted Any bugfix backported to any stable branch will have one week for review, unless cover letter expands this period. In case of no comment, the patch will be merged in stable-next branch (dylan-next, danny-next). Every friday any patch on stable-next branch will be merged on stable branch, unless any comment or bug reported. The patches sent to stable-next must have been applied in master before (unless not applicable).