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
