From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH v6 14/15] mk: Introduce ARMv7 architecture Date: Tue, 03 Nov 2015 12:18:21 +0100 Message-ID: <1494965.qdxxxY3pyY@xps13> References: <1446508048-16744-1-git-send-email-viktorin@rehivetech.com> <56388977.9030206@intel.com> <20151103102435.GD15320@bricha3-MOBL3> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Cc: Vlastimil Kosar , dev@dpdk.org To: Bruce Richardson Return-path: Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 469748E6C for ; Tue, 3 Nov 2015 12:19:32 +0100 (CET) Received: by wmeg8 with SMTP id g8so81661004wme.0 for ; Tue, 03 Nov 2015 03:19:32 -0800 (PST) In-Reply-To: <20151103102435.GD15320@bricha3-MOBL3> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 2015-11-03 10:24, Bruce Richardson: > The release notes "New Feature" section is always one that causes conflicts on > apply of patches. I think Thomas is ok to handle that on apply, or else we'd all > be constantly rebasing. Yes, it is a common conflict managed when applying. > For 2.3 we maybe need to come up with a new way to modify this to make applying > patches easier. For example, can the new features section just be pulled from > a set of individual single-bullet-point files inside a directory? Then each new > feature just drops its addition in a new file and there are no conflicts. Can > rst be used to pull into a doc a directory: e.g. "new_features/*.rst"? Good idea. But we should try to have some automatic sorting in the list.