From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id B3C5E8E86 for ; Tue, 3 Nov 2015 11:24:39 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 03 Nov 2015 02:24:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,238,1444719600"; d="scan'208";a="810515825" Received: from bricha3-mobl3.ger.corp.intel.com ([10.237.208.62]) by orsmga001.jf.intel.com with SMTP; 03 Nov 2015 02:24:36 -0800 Received: by (sSMTP sendmail emulation); Tue, 03 Nov 2015 10:24:35 +0025 Date: Tue, 3 Nov 2015 10:24:35 +0000 From: Bruce Richardson To: "Hunt, David" Message-ID: <20151103102435.GD15320@bricha3-MOBL3> References: <1446508048-16744-1-git-send-email-viktorin@rehivetech.com> <1446508048-16744-15-git-send-email-viktorin@rehivetech.com> <56388977.9030206@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <56388977.9030206@intel.com> Organization: Intel Shannon Ltd. User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Vlastimil Kosar , dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v6 14/15] mk: Introduce ARMv7 architecture X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2015 10:24:40 -0000 On Tue, Nov 03, 2015 at 10:16:23AM +0000, Hunt, David wrote: > On 02/11/2015 23:47, Jan Viktorin wrote: > --snip-- > >diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst > >index be6f827..43a3a3c 100644 > >--- a/doc/guides/rel_notes/release_2_2.rst > >+++ b/doc/guides/rel_notes/release_2_2.rst > >@@ -23,6 +23,11 @@ New Features > > > > * **Added vhost-user multiple queue support.** > > Jan, > There's a small issue here. To apply cleanly on the latest head, this line > needs to be > * **Added port hotplug support to xenvirt.** > > Rgds, > Dave. 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. 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"? /Bruce